Re:Branchless development
by spinningarrow on Monday July 20, 2015 @02:33AM
(#9914305)
Working on the same file concurrently does not guarantee conflicts - working on the same code does.
We recently switched to short-lived feature branches (short-lived as in a couple of days maximum), and I haven't had to resolve merge conflicts in months. Our feature branches previously used to last around two weeks and merging things in was collectively not looked forward to. Now I don't even have to give it a second thought.
tl;dr not having merge conflicts is an entirely possible happy reality.
We recently switched to short-lived feature branches (short-lived as in a couple of days maximum), and I haven't had to resolve merge conflicts in months. Our feature branches previously used to last around two weeks and merging things in was collectively not looked forward to. Now I don't even have to give it a second thought.
tl;dr not having merge conflicts is an entirely possible happy reality.