Skip to content

Instantly share code, notes, and snippets.

@tmoreira2020
Created June 21, 2012 18:16
Show Gist options
  • Save tmoreira2020/2967517 to your computer and use it in GitHub Desktop.
Save tmoreira2020/2967517 to your computer and use it in GitHub Desktop.
Fix a binary conflict on git
#at the branch you want to rebase into "master > mybranch"
git rebase -s recursive -X theirs master
#then a binary conflict will happen so now you must checkout the version of the binary you want
git co --theirs -- my-binary-file.bin
git co --ours -- my-binary-file.bin
#now you must stage the file
git add my-binary-file.bin
#finally
git rebase -Xtheirs --continue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment