Skip to content

Instantly share code, notes, and snippets.

@leviwilson

leviwilson/.gitattributes

Forked from danshultz/.gitattributes
Last active December 30, 2015 07:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save leviwilson/7799521 to your computer and use it in GitHub Desktop.
Save leviwilson/7799521 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitattributes
*.csproj -text merge=union
*.sln -text merge=union
@leviwilson
Copy link
Author

http://stackoverflow.com/questions/13479294/why-are-my-csproj-files-getting-messed-up-after-a-git-rebase/13483596#13483596

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment