git: fix binary file conflicts

• Solution 1: Use the local one

  git add lib/mylib.jar
  git commit -m "fix git conflict by using the local copy"
  

• Solution 2: Use the remote one

  git checkout origin/master lib/mylib.jar
  git add lib/mylib.jar
  git commit -m "fix git conflict by using the remote copy"
  

  or

  git checkout --theirs -- lib/mylib.jar
  git add lib/mylib.jar
  git commit -m "fix git conflict by using the remote copy"
  

SEE ALSO

• How to resolve a binary file conflict with Git