Git: Use git
I have don a git svn rebase and I got a conflict. I want to use git-merge-file to merge the two versions of the file by choosing the version on the server. git-merge-file has this option called --theirs but git-merg-file takes 3 parameters. How can I pass it just my file that contains the conflict markers and make it choose their version?
I also tried git merge -Xtheirs file.cpp but it doesn't work.
Maybe you can try:
git checkout --ours file.cpp
git add file.cpp
if you simply want to drop your local changes in favour of the upstream version.
Indeed, in the case of a rebase, --ours is the upstream, while --theirs are your local changes.
链接地址: http://www.djcxy.com/p/41688.html下一篇: Git：使用git