antonmry/netapps-workflow

Basic repository to explain how we work with github, waffle and jenkins

netapps-workflow

Basic repository to explain how we work with github and waffle

• Go to Waffle and choose an issue in the Ready column (weekly sprint)
• Now clone the repository:

git clone https://waffle.io/antonmry/netapps-workflow

• Create the branch:

git checkout -b gradle-test#11
git push -u origin gradle-test#11

It moves the issue to the column "In Progress" and assign the task to your user.

• Commit locally and remotely

git commit -m "Message"
git push

• It's time to do the PR, better to avoid the "git request-pull" command and use github with a title like "Closes #11 Maven and spock tests"

It moves the issue to the column "Needs review".

• Another team member review the PR and merge it.

1. From your project repository, bring in the changes and test:

git fetch origin
git checkout -b gradle-test#11 origin/gradle-test#11
git merge master

2. Merge the changes and update on GitHub:

git checkout master
git merge --no-ff gradle-test#11
git push origin master

It moves the issue to the column "Done" and closes in Github.

As reference, visit Recommended Workflow Using Pull Requests & Automatic Work Tracking