search

tkdkpk425 / Penguin

Android Game
1 stars 0 forks source link

Github conflict issue #7

Open myungkim88 opened 9 years ago

myungkim88 commented 9 years ago

We need to figure out how to resolve git conflicts for .unity and .perfab and etc.

For now, repo is reset to what Byung commited for his rotation stuff. I will re-push the start menu and other stuff next week. Meanwhile, you guys can continue upload on git.

tkdkpk425 commented 9 years ago

checkout this tool, let me know your opinion

http://flashg.github.io/GitMerge-for-Unity/

aska0711 commented 9 years ago

Can't we use git stash and git pop? also these conflicts may have happened since we just got started files are going here and there etc once things gets generalized and organized things that git offers should work fine no? what specific issues are we having with .unity and .perfab?