1116
Rebase Supremacy (programming.dev)
you are viewing a single comment's thread
view the rest of the comments
[-] andrew@lemmy.stuart.fun 3 points 1 year 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
1116 points (98.1% liked)

Programmer Humor

22285 readers
1965 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 2 years ago
MODERATORS