7 ms·
Thank you for the links! I wrote my own crappier helper to "stitch" a conflicted branch back up to date with upstream. These are great. Stitching together indi
by code_biologist 5y ago
Thank you for the links! I wrote my own crappier helper to "stitch" a conflicted branch back up to date with upstream. These are great.
Stitching together individual conflicted commits makes it obvious whether a conflict is purely textual or there's a true semantic conflict. I think a lot of programmers have a panic reaction to merge conflicts, don't think about what the conflict actually is, then introduce bugs through mistaken merges.
- pabs3 5y agoI definitely panic when encountering merge commits, then I remember imerge, abort the commit and work through each individual conflict with imerge. So much less stressful merging a very small conflict than a large one. Of course, this relies on your history splitting changes up into smaller more logical commits instead of mashing together giant commits with lots of unrelated changes.