Team 10 Work Flow Merge Policies - rsanchez-wsu/jfiles GitHub Wiki

For the majority of our development work we should be working in the team10-dev branch, that way we can have peer review and edit before pushing to master. If we find a severe blocking bug we can make the change directly in master and push making it extremely clear the bug we are fixing and what issues correspond to the bug. When it comes to merging we will keep it to whoever made the branch will be responsible for keeping it up to date with its origin branch. This policy may be extended or revised as we begin to understand our development style between all of us.

1. Right-click jfiles branch. Select pull to get the most recent changes. You may need to go team->pull from the right-click menu.
2. Work on changes or issue.
3. When done and ready to check in changes to your local repository, but not ready to push, then follow the instructions to number 6 Pushing to Remote Branches Procedure.
4. Complete step seven only if ready to push code to server.