4 ms·
We get them regularly, maybe a couple a week. But for the most part you know what you are getting into. It usually comes up in code review that there's going to
by swalberg 14y ago
We get them regularly, maybe a couple a week. But for the most part you know what you are getting into. It usually comes up in code review that there's going to be a problem.
What I don't get though is how a realtime notification would help me. If my editor started flashing that I was in conflict, what would I do differently?
- seyz 14y agoIf you are notified in realtime, the merge conflict will be based on approximatively 1 line. It's easier to resolve it. Suppose the "developer 1" working on a big feature during two weeks and a "developer 2" working on another big feature. If you detect the merge conflict at the end of the sprint, it can be difficult to resolve. Don't you think ?
- swalberg 14y agoMaybe the nature of our conflicts is different. Resolving things at the end is rarely that big of a hassle for us. I'd rather do it all at once after I'm done the work than interrupt my train of thought to fix it at the time.