Public:Working with code repo

From YaddaWiki

1. Create a feature branch: git checkout -b feature_branch_name (feature_branch_name should start with your github login)
   
   
2. Make your changes
   
   
3. Commit your changes
   
   
4. [Optionally, so the pull request will be more up-to-date] Clean up your history: git rebase master
   
   
5. Run tests: gradlew clean test and gradlew clean slowTest
   
   
6. Push the changes: git push origin feature_branch_name
   
   
7. Issue a pull request on github (or merge request on GitLab) with master as the base branch and feature as the head branch
   
   
8. Wait for changes to be accepted. If you are asked to revise your changes, edit your branch and push the changes.
   
   
9. Clean up your history: git rebase master
   
   
10. Merge the feature branch into master: git checkout master and then git merge feature_branch_name (or git merge --squash feature_branch_name if there are more than 1 commit in the feature branch)
    
    
11. If merge was done with --squash option, then commit merged changes and modify commit message: git commit
    
    
12. Pull the changes from origin: git pull --rebase origin (or git fetch origin and git rebase origin/master)
    
    
13. Run tests before push: gradlew clean test and gradlew clean slowTest
    
    
14. Push the changes to the master branch: git push origin master
    
    
15. Delete the feature branch: git branch -D feature_branch_name and then git push origin :feature_branch_name
    
    
16. [Optionally] Delete references to remote branches that do not exist in the repository anymore: git remote prune origin