-
Notifications
You must be signed in to change notification settings - Fork 0
Created Page for current Git Github Workdflow
Github desktop is used. Git for large files is currently not used. Reason: Needs to be figured out yet.
it means that everybody should try to keep his branch up to date with the main branch as much as possible. When someone makes a commit on his own branch, he should merge its branch with the main branch as soon as possible.
In unity meta files are used for every asset including CSharp script.These meta files are used to store actions to set up things in the unity inspector. This meta files tend to cause merge conflicts. The chance of that is higher to the degree of the number of not merged commits with the main branch. Resolving merge conflicts for meta files leads to unusual settings the unity editor.
There 2 scenarios to consider for that.
Before you start to work, pull and merge possible commits from the main branch into your branch. If a merge conflicts with a meta file occurs then create a branch based on the main branch and work with that form now on.
Switch to the main branch and pull/merge for possible commits into the main branch.
Switch back to your branch and try to merge the main branch into yours. If merge conflicts with meta files occur then create a branch based on the main branch and work with that form now on.
Push your branch on Github and switch to the main branch. Then merge your branch into the main branch. Push that local main branch to the global main branch.