Confirmed users
753
edits
Web Testing/Automation/CodeReviewProcess: Difference between revisions
Jump to navigation
Jump to search
Web Testing/Automation/CodeReviewProcess (view source)
Revision as of 10:37, 27 May 2011
, 27 May 2011→How to do a merge?
| Line 13: | Line 13: | ||
==How to do a merge?== | ==How to do a merge?== | ||
Once a pull request ready to be pulled | Once a pull request ready to be pulled the following steps should be followed. | ||
* git branch pullrequest | |||
* git checkout pullrequest | |||
** The reason for doing it in a branch is if there are conflicts it won't break you local master | |||
* git remote add requestee requestee_git_fork_url | |||
* git fetch requestee && git merge requestee/pull_request_branch_on_their_fork | |||
* Run the tests | |||
** Sometimes good looking code doesn't actually work so lets prove it works! | |||
** If, and only if, it passes do the next steps | |||
* git checkout master | |||
* git merge pullrequest master | |||
* git push origin master | |||
* git branch -d pullrequest | |||
This will have it all stored in the remote master and you will have a clean version locally | |||