Git workflow

When you, as an individual, sit down to work on things

1. Make sure you are viewing your team’s branch
2. Pull from your team’s branch
3. Merge any remote/origin changes regarding your team’s branch - this happens when the local copy isn’t up-to-date
4. Make the changes you sat down to do
5. Test the build - terminal ./gradlew clean build
6. Commit changes
7. Pull (this will fetch and merge), maybe resolve any conflicts on your team’s branch due to people working at the same time
8. Push to your team’s branch


Master

1. Check build is not broken on master and on inventory
2. Message slack #6-rocketpotatoes that you are about to merge in your branch
3. Change view to master
4. Pull master into your team’s branch  
5. Resolve any merge conflicts - >>> head >>> is one version the other is below that - manually look through and choose what you want to keep/discard
6. Run tests and build (./gradlew clean build)
7. Merge your team’s branch into master