How to fix conflicts in Git repositories after Xcode update

A few days ago I updated to Xcode 6.0.1 (from 5.x), after which I found out that it gave me some unwanted files in the Git repositories on my MacBook Pro, which are not used with Xcode by the way.

As I didn’t want to delete a few thousand files by hand on each project, I came up with the following command.

find . -name "*\ \(Exemplaar\ met\ conflict\ van\ MacBook-Pro-van-D\ 2014-09-16\)*" -exec rm -f {} \;

You can use this command in your own repositories (before committing them!) but you’ve to edit it to your own situation.

Geef een reactie

Het e-mailadres wordt niet gepubliceerd. Vereiste velden zijn gemarkeerd met *