4 ms·
I definitely panic when encountering merge commits, then I remember imerge, abort the commit and work through each individual conflict with imerge. So much less
by pabs3 5y ago
I 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.