Comments on: Fixing binary merge conflicts in git

By: tariq

tariq — Wed, 14 May 2014 07:08:04 +0000

Once you have resolved conflicts by adding the files to git (git status — tells you) do a commit.

By: Bill

Bill — Wed, 14 May 2014 07:05:54 +0000

I don’t understand what happens after you copy REMOTE over the original file. Then what? I still have the four image files in my directory. What do I now do with Git?

thanks!

By: Michael

Michael — Wed, 14 May 2014 07:05:13 +0000

Great post, really useful!

Quick question, how do you handle Xcode project files, such as the project.pbxproj file? It’s a text files bit it’s advised to treat it as binary.

With a conflict, do you just select the latest or do you merge with FileMerge?

Thanks!