@mastermind@lemm.ee to Programmer Humor@programming.dev • 2 years agoOpenheimer in programmingi.postimg.ccimagemessage-square17arrow-up1307
arrow-up1299imageOpenheimer in programmingi.postimg.cc@mastermind@lemm.ee to Programmer Humor@programming.dev • 2 years agomessage-square17
minus-square@Double_A@discuss.tchncs.delinkfedilink2•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-square@BeigeAgenda@lemmy.calinkfedilink2•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.