On Thursday, 6 September 2012 08:14:47 UTC+1, Evert Tigchelaar wrote:
> Hi,
> A little while ago I had some problems with git and a colleague with more 
> git
> experience helped me and performed a git rebase and now "theirs" and 
> "ours" are reversed.
> I read (in the documentation) this is normal but is there a way to reverse 
> "theirs" and "ours" again?
> I ask this because its confusing when resolving a merge conflict.
> In the past I could use: 
> git checkout --theirs <filename> 
> to checkout theirs version but now I have to do:
> git checkout --ours <filename>
> to checkout theirs version.

I'm pretty sure there isn't a way to reverse this. There was some 
discussion on the mailing list a long time back, but I don't recall it 
going anywhere.

It may help, however, to understand *why* things are the way they are.

When you `git checkout master; git merge branch`, you sit on the master 
branch, then apply changes from the develop branch. Therefore master is 
'ours', and branch is 'theirs'.

However, when you `git checkout master; git rebase branch` (this is the 
slightly unusual situation of rebase master *onto* branch, but I'm doing it 
to keep the examples consistent), git actually checks out branch, then 
applies patches from master. So, branch is 'ours' and master is 'theirs'.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to