User:Phroughy/testtemplate

= =

Branch Creation
Make sure your base is up to date

git checkout git pull origin

Create the branch

git checkout -b

Push Code
Once the developer has completed the, he should ensure that his branch is up to date with the base and then push his code.

git checkout git pull origin git checkout git merge

Push the branch

git push origin

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

{{#ifeq: {{{Test on release}}} | true |

QA Tests on Test
The developer will merge the onto the release branch, and QA will test it there.
 * }}

{{#ifeq: {{{Test on beta}}} | true |

QA Tests on Beta
DevOps will merge the to beta, and QA will test it there.
 * }}

Merge onto
At this point, the branch has passed all required testing and can merge it onto.

Merge Process
Once ready to be merged, the branch is merged back into  by.

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

git checkout git pull origin git checkout git merge

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

git checkout git merge --no-ff

Delete the local and remote branch

git branch -d git push origin :

Post Merge Test
Once the branch is merged into, then DevQA or QA should test that the base branch functions correctly before marking the card as done.