Re:Is Git Irreplaceable? (2019)
by hn_acc_1 on Monday January 06, 2020 @08:47PM
(#21975891)
Merge conflicts are not so scary, and are an elegant way to handle distributed changes with simultaneous edits to a single file.
If the conflict is huge, rebasing can help you by "playing" the commits from one branch one at a time so the conflicts are smaller / easier to fix.
At a previous job, a team was forced to use checkout-style VCS due to their manager's unfounded fear of merge conflicts; I couldn't go in that office without hearing one developer shout to another: "Hey, can you finish up and check in that file so I can get started on my changes?"
Re:Is Git Irreplaceable? (2019)
by hinkley on Tuesday January 07, 2020 @02:03AM
(#21977683)
I’ve spent too much time helping others fix bad merges, and I still catch myself making mistakes. There’s a lot of work that could be done for clarity and error avoidance.
If the conflict is huge, rebasing can help you by "playing" the commits from one branch one at a time so the conflicts are smaller / easier to fix.
At a previous job, a team was forced to use checkout-style VCS due to their manager's unfounded fear of merge conflicts; I couldn't go in that office without hearing one developer shout to another: "Hey, can you finish up and check in that file so I can get started on my changes?"