merge conflict window: mine and theirs mixed up.

[ofarrill]

Maybe I misunderstand the view - but to my interpretation USE MINE and USE THEIRS are mixed up.

[love-linger]

For cherry-pick/standard merge:

MINE: is local change
THEIRS: is in-coming change

For rebase:

MINE: change from the branch that rebased on
THEIRS: change from the original HEAD branch

Rebasing is equivalent to the following operations:

1. Checkout the branch that rebased on
2. Cherry-pick your changes one-by-one to the checkouted branch

[love-linger]

If the conflict comes from auto re-apply stash after Pull, it just like rebasing:

MINE: current branch HEAD
THEIRS: stashed local changes

[love-linger]

In short, the easiest way to understand MINE and THEIRS is:

MINE: changes from CURRENT head
THEIRS: changes you want to apply to current branch

[love-linger]

You can just run git checkout --mine -- <file-path> to see which part is MINE

Usually, after running this command, this file will disappear from UNSTAGE & STAGED change list. Because USE MINE means you do not want to accept the in-coming change. So there will be no change for this file compared to current HEAD.

[ofarrill]

@love-linger, thanks for the clarification and sorry for the noise!
My confusion comes from re-applying stashed changes, where "mine" stash is considered "THEIRS" because it's applied against the from the origin updated (now current local) state.