3 ms·

Merge and conflict resolution is a minefield if unexperienced developers do it too. Fortunately it can (often) be arranged that those with some understanding of

Merge and conflict resolution is a minefield if unexperienced developers do it too. Fortunately it can (often) be arranged that those with some understanding of the issues involved can do the resolution.

cerved 4y ago
you get the same, and often more, conflicts using rebase
z3t4 4y ago
Always clone to another folder before merging ;)