3 ms·
If 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
by seyz 14y ago
If 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.