3 ms·
"Same with merge conflicts on .pbxproj files - these files weren’t checked into source control." I use SourceGear DiffMerge as my default Git mergetool. Makes
by interpol_p 14y ago
"Same with merge conflicts on .pbxproj files - these files weren’t checked into source control."
I use SourceGear DiffMerge as my default Git mergetool. Makes it pretty straightforward to merge .pbxproj files.
- Tloewald 14y agoGood to know. I've merged both xib and pbxproj files and while it's possible it's not pretty.