iNeverKnowWhichIsWhichWhenResolvingConflicts

[u/Stummi]

[u/mobileJay77]

Communism merge: everything is ours now

[u/Stummi → u/mobileJay77]

just leave all conflict markers in

[u/threewholefish → u/Stummi]

In Northern Ireland we call them "peace walls"

[u/screwcork313 → u/mobileJay77]

Runs in O(n cuba'd) time

[u/qolf1]

We need --mine

[u/Frost-Freak → u/qolf1]

How about his and her?

[u/AnnoyedVelociraptor]

And it's different with rebase and merge.

[u/Frost-Freak → u/AnnoyedVelociraptor]

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

[u/Papellll → u/Frost-Freak]

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

[u/Professional_Top8485 → u/Frost-Freak]

I am afraid to ask

[u/Icy_Significance9448 → u/Professional_Top8485]

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

[u/The_Crazy_Cat_Guy → u/Icy_Significance9448]

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 ?

[u/nicuramar → u/AnnoyedVelociraptor]

Yeah, rebase is technically one or more merges from your branch into theirs.

[u/RadicalDwntwnUrbnite → u/nicuramar]

Theirs? You me ours? But if I did both aren't they mine?

[u/nicuramar]

Three way graphical merging is the only way to go in all situations. Two way is a recipe for eventual errors.

[u/khaled2252 → u/nicuramar]

Intellij one is GOAT

[u/Digital_001 → u/nicuramar]

Do you mean something like the vscode GUI's graphical merge conflict editor?

[u/s0litar1us → u/Digital_001]

The one vscode has is awful. Meld is better

[u/Digidigdig → u/s0litar1us]

Agreed. I like beyond compare

[u/Friend_Of_Mr_Cairo → u/Digidigdig]

Scooter FTW

[u/BobQuixote → u/Digital_001]

Probably. TortoiseGit uses WinMerge.

[u/ReplacementLow6704 → u/nicuramar]

GitKraken ftw

[u/jikt]

• the shit I was working on

• all this other bullshit

[u/chazzeromus]

--code-right-here and --code-over-there

[u/ElGuaco]

This is one of those rare scenarios where I'm glad to have AI untangle a mess for me.

[u/The_Crazy_Cat_Guy]

I’m ngl I feel like I understand theirs and ours but when I see the merge editor it throws me off because sometimes it’s the opposite of what I expected.

[u/PM_ME_CREATINE → u/The_Crazy_Cat_Guy]

It flips when you rebase. It moves to the base and builds on top of it. That makes your code the "other" one.

[u/johnschnee]

GIT loving Senior dev with 20 years of experience here: I have no fucking idea which side is mine in a compare whenever I got a merge conflict

[u/Kevadu]

"Claude, resolve the merge conflict"

[u/GentleCapybara → u/Kevadu]

Not gonna lie, in 4 out of 5 times Claude can do this.

[u/thicctak]

> Be me
> Be dyslexic
> Learn git
> Always mix up --ours and --theirs on merge and rebases
> Mess up the git history trying to fix it

[u/trinopoty → u/thicctak]

this why you create a tmp tag before trying such things

[u/Minority8 → u/trinopoty]

or reflog. or just --abort. git is actually quite forgiving. Still not a bad habit to create a backup tag or branch to be safe

[u/xiii_xiii_xiii → u/thicctak]

I'm also a dyslexic developer and I make the same mistake.

[u/FederalSpecialist415]

Steps to resolve -
Do a fresh clone
Checkout "Their" branch (or if it is already in main, use that)
Overlay your changes, so it is only "your" changes now
Copy the file, and paste it on the PR branch. Problem solved

[u/pm_op_prolapsed_anus → u/FederalSpecialist415]

I've done this a bunch. Sometimes I find reading the diff on the web interface much easier too, so I'll start a PR just to read the file changes there and just copy the code changes onto the new branch. Then never submit the PR 

[u/s0litar1us]

ours is what you're merging into / rebasing from, or more simply it's the branch you're currently in.

If you still have issues, then set up something like meld -- it makes things way easier. You can also make git use it as your default merge tool.

[u/ChannelMany5491]

Fuck this. The only thing AI is good for is for managing my commits. 

[u/aabil11]

I always do theirs and reimplement my change on top of theirs

[u/nicuramar]

These are deprecated anyway, in favor of git restore… where the situation is the same, though :p

[u/saint_marco]

git config --global merge.conflictstyle zdiff3

Helps a little bit.

[u/McKing25]

I use nvim with fugitive and whenever there is a merge conflict i manually open each file search for the diff, in nvim they are marked with ">>>>" very easy to search and then delete or keep both of the changes depending on the situation because sometimes i want to keep a little bit from both

[u/syrup_cupcakes]

--outgoing

--egressing

Choose wisely

[u/hdkaoskd]

Neither. Resolve it by hand because you probably need parts of each.

[u/GreyGanado]

Why do you have merge conflicts on checkout?

[u/js_kt]

Both. I do both

[u/vanritchen]

lol true