Bug Fixing & Reviewing process

BUGFIXING.md

this process suppose all devs have push&pull access to all repositories

When you decide to start working on a bugfix:

1. create a branch:

   git checkout master // to make sure you branch from master

   git checkout -b fixXXX

2. Think, Code, Test, Be Awesome

3. Commit(s)

4. Create origin's branch fixXXX and push code there

   git push origin fixXXX

5. Open branch fixXXX on github

6. Create a pull request starting with: "My awesome new fix/feature"

   Do not send any extra email (they should have received the review request since they watch the repo) People comment directly on the pull request

7. Discuss reviews directly on pull request & amend code

   git commit

   git push origin fixXXX

   Notify by a comment on pull request that you amended the code

8. When reviewed & ready, squash some commits, rebase it and push (don't use the github button)

   git rebase master // if the master have changed since

   git rebase -i // to squash/edit some commits

   git checkout master

   git merge -no-ff fixXXX

   git push origin master

9. Cleanup branch

   git branch -d fixXXX

   git push origin :fixXXX

When you want to review a bug/feature:

1. Click on the pull request you received

2. Checkout the diff

3. If it makes sense run the branch:

   git fetch origin

   git checkout -t origin/fixXXX

   Run the project

4. Comment directly on the pull request without sending email

5. Notify directly on the pull request by a comment when you are OK with the fix