Home

Git Workflow

1. Add all changed files:
   git add <file names>

2. Commit the changed files:
   git commit -m <commit name>

3. Check if your local version of master is up to date with the remote version of master:
   git fetch -av

4. If your local master is not up to date, rebase to get all the changes since your last pull:
   git rebase origin master

5. If while rebasing a merge conflict comes up, fix it, then continue the rebase:
   git rebase --continue

6. When done rebasing, push your changes to master
   git push origin master