Custom Merge Drivers and others solutions

For this iDevBlogADay I wanted to continue with my problem from last time. Git is the best version control system I have ever used. It changed the way I look at version control. In fact I would go as far as to say that it's the first time I really understood what version control could be. It changed the way I work on my iPhone games. But last time I explained that it's not all rosy.

Trying to merge the xcodeproj file can be a pain. It's hard to read and understand what is going on and requires you stop what you are doing and figure out how to correct it. Otherwise you may not be able to even open your project. And recreating your project file is just not an acceptable solution. I have a couple of ideas that I am going to try in addition to the one I gave last time.

ReReRe


rerere is an option that you can turn on in git that allows you to do a merge once and it will remember what you did and do it again for you. Like I said these are things I am going to try and see how they go.

Custom Merge Driver


Custom merge drivers allow you to specify a script that you can use to figure out how to merge a file with a specific file extension. Though this method would probably require that I figure out how the project file works and then write a script to parse it I still think this is an interesting option. And perhaps one I could share with other Xcode devs.

I apologize for my posts being terse but I am in the middle of an awesome iPhone project and enjoying myself too much. Breaking away to blog has been tough the last two weeks. Until next time please check out the other great dev's that post for iDevBlogADay!