Skip to content

Instantly share code, notes, and snippets.

@spolu
Created August 9, 2012 08:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save spolu/3302228 to your computer and use it in GitHub Desktop.
Save spolu/3302228 to your computer and use it in GitHub Desktop.
Bug Fixing & Reviewing process
// this process suppose all devs have push&pull access to all repositories
When you decide to start working on a bugfix:
---------------------------------------------
- create a branch:
> git checkout master // to make sure you branch from `master`
> git checkout -b fixXXX
- Think, Code, Test, Be Awesome
- Commit(s)
- Create origin's branch fixXXX and push code there
> git push origin fixXXX
- Open branch fixXXX on github
- Create a pull request starting with: "Please Review: [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
> assign yourself to the pull request to have a way to keep track
- 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
- If needed, merge new code from master
> git pull origin master
> merge conflicts, commit and push to fixXXX
- When reviewed & ready, merge directly from github
- Cleanup branch and update your master
> git checkout master
> git pull origin master
> git branch -d fixXXX
> git push origin :fixXXX
When you want to review a bug/feature:
--------------------------------------
- Click on the pull request starting with "Please Review: ..." you received
- Checkout the diff
- If it makes sense run the branch:
> git checkout master
> git checkout -b fixXXX
> git pull origin fixXXX
> run the project
- Comment directly on the pull request without sending email
- Notify directly on the pull request by a comment when you are OK with the fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment