mastermind@lemm.ee to Programmer Humor@programming.dev · 2 years agoOpenheimer in programmingi.postimg.ccimagemessage-square9fedilinkarrow-up1239arrow-down16
arrow-up1233arrow-down1imageOpenheimer in programmingi.postimg.ccmastermind@lemm.ee to Programmer Humor@programming.dev · 2 years agomessage-square9fedilink
minus-squareDouble_A@discuss.tchncs.delinkfedilinkarrow-up1·edit-22 years ago git can get confused about if a commit was merged or not. You have to revert the revert before re-merging the branch. Otherwise git keeps track of the commits that you reverted and doesn’t apply them ever again. See: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt
minus-squareBeigeAgenda@lemmy.calinkfedilinkarrow-up1·2 years agoThanks for the info, I think that’s exactly what we didn’t do.
You have to revert the revert before re-merging the branch. Otherwise git keeps track of the commits that you reverted and doesn’t apply them ever again.
See: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt
Thanks for the info, I think that’s exactly what we didn’t do.