{{{Scenario}}}

Make sure your base is up to date

git checkout {{{Branch base}}}
git pull origin {{{Branch base}}}

Create the branch

git checkout -b {{{Branch example}}} {{{Branch base}}}

Once the developer has completed the {{{Branch type}}}, he should ensure that his branch is up to date with the base ({{{Branch base}}}) and then push his code.

git checkout {{{Branch base}}}
git pull origin {{{Branch base}}}
git checkout {{{Branch example}}}
git merge {{{Branch base}}}

Push the branch

git push origin {{{Branch example}}}

DevQA will then checkout the branch and test it. If any defects are found, the card is returned to the developer.

At this point, the branch has passed all required testing and {{{Branch merger}}} can merge it onto {{{Branch base}}}.

Once ready to be merged, the {{{Branch type}}} branch is merged back into {{{Branch base}}} by {{{Branch merger}}}.

Make sure you merge the base ({{{Branch base}}}) back into your branch first. (Note about conflicts?)

git checkout {{{Branch base}}}
git pull origin {{{Branch base}}}
git checkout {{{Branch example}}}
git merge {{{Branch base}}}

Now merge your branch into the base branch Do not forget to use --no-ff!

git checkout {{{Branch base}}}
git merge --no-ff {{{Branch example}}}

Delete the local and remote branch

git branch -d {{{Branch example}}}
git push origin :{{{Branch example}}}

Once the {{{Branch type}}} branch is merged into {{{Branch base}}}, then DevQA or QA should test that the base branch functions correctly before marking the card as done.