Git instructions - Group7B/IPPD-rater GitHub Wiki

To update your branch with remote updates:

git fetch # This gets all of the changes
git status # This tells you what those changes are, if it says you are 1 or more commits behind, then you have to pull
git pull # This downloads other people's changes. Always Do this before committing anything!

To commit code to the branch you are currently working on:

git status
git add (filepath) # Adds the changes that you have made to your next commit. Always be sure to add files on an individual basis
git commit # Your terminal will become a text editor, write a message explaining what changes you made and then save them.
git stash
git pull --rebase
git stash apply
git push # Upload your changes to github.

Merging your branch back into develop:

git fetch origin  # Retrieve updates before merging
git checkout develop
git pull  # Make local develop equal to remote develop before merging
git checkout (your branch)
git merge develop  # Merge the branch back into develop