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.
Thanks ad advance, Evert -- 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 https://groups.google.com/d/msg/git-users/-/GMyxPBM12OkJ. To post to this group, send email to firstname.lastname@example.org. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.