we have a game team of over 10 with programmers, artists, animators, level designers and all different types using unreal engine 4 to make a game.
We are use to the tortoise svn workflow and are now realizing git is much different especially in regards to "merge".
we are having issues especially with "merge" where people are doing a commit/push and if there is or isn't a conflict it seems to do these "merges" and overrigt, or wipeout files or work that other team members have done and we don't know why.
we are assuming that sourcetree was made for code only and can easily merge text but when it comes to multi asset (binary files) and code at the same time in a big team we are having a lot of issues losing work.
lastly we are all working in one master branch. I've been told that we may need one more "working" branch before we go to master or each member on the team need their own branch and then when happy merges their changes on their own into master.
There is also this "rebase" function instead of merge and a. I don't know how to turn this on and b. if this will fix our issues or create more?
basically tortoise svn works great but we have a github account and I really want to use it. so if someone can tell me a workflow with sourcetree/git that works like tortoise svn where we won't lose files I'd be greatly appreciated.
There are a few things you've mentioned that need to be separated out…
Git is fundamentally different in how it functions versus SVN; there is no central server per se and it just happens to be that you've chosen GitHub as your team's remote backup for coordinating work (versus Bitbucket Cloud or others.) I would recommend spending some time with our Git tutorials to learn the ropes. HTH.
Senior Mac Developer, Sourcetree
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events