1106
Rebase Supremacy (programming.dev)
submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev
229 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[-] andrew@lemmy.stuart.fun 3 points 7 months ago

Yeah, the image (not mine, but the best I found quickly) kinda shows a rebase+merge as the third image. As the other commenter mentioned, the new commit in the second image is the merge commit that would include any conflict resolutions.

this post was submitted on 04 Apr 2024
1106 points (98.1% liked)

Programmer Humor

19623 readers
1 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