Last active
January 29, 2019 18:41
-
-
Save sendoa/8957654 to your computer and use it in GitHub Desktop.
Sendoa's .gitattributes for Xcode Projects
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Read http://robots.thoughtbot.com/xcode-and-git-bridging-the-gap for an explanation | |
| # Read https://roadfiresoftware.com/2015/09/automatically-resolving-git-merge-conflicts-in-xcodes-project-pbxproj/ for more | |
| *.pbxproj merge=union | |
| *.strings text diff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment