Development Process

Branching

When preparing to work on a new feature or defect, the following are some helpful guidelines for branching.

• Prepare for creating a new branch.

git checkout master
git pull upstream master
git push origin master

• Create and checkout a new branch.

git checkout -b <branch-name>

• Write the code and commit it to the branch after adding each changed file.

git add <file-name>
git commit

• Push the branch to your forked repository.

git push origin <branch-name>

• Create a Pull Request in Github.
• Wait for the Pull Request to be merged.
• Once the Pull request has been merged, clean up the branch.

git checkout master
git pull upstream master
git push origin master
git branch -d <branch-name>
git push origin :<branch-name>