christianfox / gitxc Goto Github PK
View Code? Open in Web Editor NEWCommand Line tool that performs git merge or pull but additionally checks for and resolves conflicts in an Xcode project's info.plist files, specifically conflicts with the CFBundleVersion value.