mastermind@lemm.ee to Programmer Humor@programming.dev · 2 years agoOpenheimer in programmingi.postimg.ccimagemessage-square14fedilinkarrow-up1308arrow-down18
arrow-up1300arrow-down1imageOpenheimer in programmingi.postimg.ccmastermind@lemm.ee to Programmer Humor@programming.dev · 2 years agomessage-square14fedilink
minus-squareDouble_Alinkfedilinkarrow-up1·edit-22 years agoThere are situations where it does actually cause problems when you want to merge the branch again. It knows that those specific commits have already been reverted once, so it doesn’t apply them… See also: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt (especially line 56) Basically you need to revert the revert, before re-merging the fixed branch. Otherwise you will lose commits without noticing!
There are situations where it does actually cause problems when you want to merge the branch again. It knows that those specific commits have already been reverted once, so it doesn’t apply them…
See also: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt (especially line 56)
Basically you need to revert the revert, before re-merging the fixed branch. Otherwise you will lose commits without noticing!