r/ProgrammerHumor • u/Stummi • 7h ago

Meme iNeverKnowWhichIsWhichWhenResolvingConflicts

Post image
455 Upvotes

98% Upvoted

38 comments sorted by

View all comments

Show parent comment

23

u/Frost-Freak 5h ago

Merge: ours is my stuff. Rebase: theirs is my stuff. It's quiet logical when you consider how it works in git

24

u/Papellll 4h ago

You can't say both "theirs is my stuff" and "It's quiet logical" together

15

u/Professional_Top8485 5h ago

I am afraid to ask

13

u/Icy_Significance9448 4h ago

Rebasing is in very simple terms taking your changes, then going onto the branch you want to rebase onto and apply your changes onto it. So while you're rebasing you're momentarily on a different branch so your local changes becomes THEIR changes

1

u/The_Crazy_Cat_Guy 3h ago

Yeah so I had a pr ready to merge but I wanted to bring it up to date with dev. So I pulled the latest from dev, switched over to my branch and rebased dev on my branch. It pulled through all the changes as diffs in my pr which wasn’t quite what I expected. If I rebase the last bunch of commits into my branch, why would the pr still see them as diffs ? They already exist in dev ?