this post was submitted on 22 Jul 2023
299 points (97.5% liked)

Programmer Humor

19589 readers
414 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
299
Openheimer in programming (i.postimg.cc)
submitted 1 year ago by mastermind@lemm.ee to c/programmer_humor@programming.dev
17 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] Double_A@discuss.tchncs.de 2 points 1 year ago* (last edited 1 year ago) (1 children)

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

[โ€“] BeigeAgenda@lemmy.ca 2 points 1 year ago

Thanks for the info, I think that's exactly what we didn't do.