Reputation: 572
I'm following the Unity 3D guide to enable SmartMerge in Git, but I'm quite confused. It literally says:
Add the following text to your .git or .gitconfig file
but I don't have any in my repo. I know there is a .gitconfig
file which is global for the whole Git installation, and thus it doesn't seem very logic as a place to put repo-specific settings, and .git
is a folder in git repos, not a file.
Where do I have to put those lines?
Upvotes: 0
Views: 177
Reputation: 572
The file where you should put those lines is actually config
in the .git
folder. Don't know why the Unity docs are so confusing about this.
Upvotes: 2