Workflow - AlpriElse/maine-dashboard GitHub Wiki

1. Assign yourself an issue
2. Create a new branch for the issue
   • [Issue Number]-[Descriptive traincase name]
   • 16-course-browsing
3. Work on branch
4. Add, commit, pull, push
   • Follow version control styling wiki
5. Once finished, pull dev branch into issue branch
6. Resolve merge conflicts
7. Submit pull request into dev branch for the milestone
   • Use default pull request syntax
   • If using command line, use git merge --no-ff 16-course-browsing
     • Prevents fast-forwarding
   • dev-0.0.1
8. Once the milestone is completed, pull master into dev branch
9. Resolve merge conflicts
10. Submit pull request into master
    • Use default pull request syntax

Refer to this.