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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

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

[–] Hexarei@programming.dev 5 points 1 year ago (1 children)

Revert doesn't just move head back, it creates reversal commits. As such, merging again can happen since the changes are present and require a merge commit

[–] Double_A@discuss.tchncs.de 1 points 1 year ago* (last edited 1 year ago)

There are situations where it does actually cause problems when you want to merge the branch again. It knows that those specific commits have already been reverted once, so it doesn't apply them...

See also: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt (especially line 56)

Basically you need to revert the revert, before re-merging the fixed branch. Otherwise you will lose commits without noticing!