5 ms·
That's why you don't squash before merging. If you merge the original commits (and make a separate commit for the minor fix), you can revert the problematic com
by tremon 6y ago
That's why you don't squash before merging. If you merge the original commits (and make a separate commit for the minor fix), you can revert the problematic commit without affecting the rest of the feature.
- hibbelig 6y agoBut making a separate commit for the minor fix is onerous once your working copy has accumulated other changes. That's what the OP says -- you have to use "git add -p" and that is onerous.