1106

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

[-] pineapple_pizza@lemmy.dexlit.xyz 13 points 7 months ago

This diagram seems wrong to me. Isn't the second image a squash merge? Also why would rebasing a feature branch change main?

[-] 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.

[-] Atemu@lemmy.ml 2 points 7 months ago

The only difference between a *rebase-merge and a rebase is whether main is reset to it or not. If you kept the main branch label on D and added a feature branch label on G', that would be what @andrew@lemmy.stuart.fun meant.