Conflict "theirs" and "mine" are reversed during a rebase
By tomas.lund... on September 10, 2009 00:31 (imported from Google Code)
What steps will reproduce the problem?
- Fetch some changes that will cause a conflict once merged
- Rebase your head onto the fetch head
- Attempt to resolve a conflict with "theirs" and "mine"
What is the expected output? What do you see instead?
I expect "mine" to refer to my version of the code and vice versa. Instead,
"mine" refers to their code and "theirs" to my code.
What version of the product are you using? On what operating system?
TortoiseGit 1.0.2.0 on Windows Vista.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information