A little while ago I had some problems with git and a colleague with more
experience helped me and performed a git rebase and now "theirs" and "ours"
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.
Thanks ad advance,
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 email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at