Openheimer in programmingi.postimg.ccimage mastermind ( @mastermind@lemm.ee ) Programmer Humor@programming.dev • 11 months ago message-square10fedilinkarrow-up1190
arrow-up1190imageOpenheimer in programmingi.postimg.cc mastermind ( @mastermind@lemm.ee ) Programmer Humor@programming.dev • 11 months ago message-square10fedilink
minus-square Double_A ( @Double_A@discuss.tchncs.de ) linkfedilink2•edit-211 months 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 ( @BeigeAgenda@lemmy.ca ) linkfedilink2•11 months 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.