search

otherotherjosh / GTS

welcome to GTS
1 stars 0 forks source link

Set up unity smart merge #9

Closed otherotherjosh closed 2 weeks ago

otherotherjosh commented 2 weeks ago

Issue

As a developer, I want to easily merge commits, so that I can focus on building better features.

Requirement

Figure out how to work with Unity's smart merge tool and come up with a team workflow around it.

otherotherjosh commented 2 weeks ago

Unfortunately there's no neat way to put smart merge up on the repository, so when anyone clones the repo they will have to set it up on their local remote. Instructions have been written by Christian over on the wiki, here.