search

Jacobkmiller / me-games

0 stars 0 forks source link

Merge conflicts suck #2

Open SamClose opened 6 years ago

SamClose commented 6 years ago

Either of you found a good way to deal with merge conflicts in the scene file?

Jacobkmiller commented 6 years ago

Not yet, we just make sure it runs before committing. #unitynewbs

ZakEspley commented 6 years ago

There is a unity tool called SmartMerge that we can try to use. I think it goes along with Git. Thoughts and ideas?

SamClose commented 6 years ago

Let's try it