mastermind@lemm.ee to Programmer Humor@programming.dev · 1 year agoOpenheimer in programmingi.postimg.ccimagemessage-square14fedilinkarrow-up1308arrow-down18
arrow-up1300arrow-down1imageOpenheimer in programmingi.postimg.ccmastermind@lemm.ee to Programmer Humor@programming.dev · 1 year agomessage-square14fedilink
minus-squareDouble_Alinkfedilinkarrow-up2·edit-21 year 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-up2·1 year 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.