Unity Version: 6000.2.15f1 (https://unity.com/releases/editor/archive)
GitHub Desktop: https://desktop.github.com/download/ You will need to send me your username so I can whitelist you as a contributor
First Steps:
Second Steps:
Repository/Repo - the "shared drive" type container for a project
Origin - the online repo we share
Local - your version of the repo, can be out of date
Commit - saves your work locally
Stash - save unfinished work for later
Fetch - Views changes from origin
Pull - Grabs and applies changes (Fetch and Pull are different, but GitDesktop uses them interchangeably)
Push - Sends your commits to the repo
Branch - A separate version of the repo that doesn't affect the main branch
Main - Primary branch, the "official" version.
Rebase - Brings your branch up-to-date with another and moves all your commits on top
Merge - Combines two branches
Checkout - Sets your active current branch
Branches Workflow video: https://youtu.be/5yXApG6YVwQ
Steps for merging a branch:
Keeps the problems off the main branch and lets multiple people work on the same project at once.
Task-oriented. Merge ONLY when you've fixed anything you broke and when your task is done. This should probably be once a week, give or take a few days.
Yes! Although I didn't show it you can. I'd recommend deleting your safety branch. What's the workflow again? Create a branch, make changes, rebase the branch to main, test in Unity and solve any conflicts, merge main to branch. Commit, pull, push.