Confirmed users
182
edits
Web Testing/Automation/CodeReviewProcess: Difference between revisions
Jump to navigation
Jump to search
m
Web Testing/Automation/CodeReviewProcess (view source)
Revision as of 21:10, 29 July 2011
, 29 July 2011no edit summary
mNo edit summary |
mNo edit summary |
||
| Line 37: | Line 37: | ||
*'''git checkout '''''<b>master (</b>''Switch to your ''master'' branch) | *'''git checkout '''''<b>master (</b>''Switch to your ''master'' branch) | ||
*'''git merge '''''<b>pullrequest master</b>'' (Merge your branch (working copy)''pullrequest ''with the current master branch)<br> | *'''git merge '''''<b>pullrequest master</b>'' (Merge your branch (working copy)''pullrequest ''with the current master branch)<br> | ||
*'''git push ''origin master'''''(Push the changed stuff in your master branch back to your origin repository at github) | *'''git push ''origin master''''' (Push the changed stuff in your master branch back to your origin repository at github) | ||
*'''git branch -d '''''<b>pullrequest</b>'' (Delete the working branch you created, as everything is now merged with your master branch) | *'''git branch -d '''''<b>pullrequest</b>'' (Delete the working branch you created, as everything is now merged with your master branch) | ||
This will have it all stored in the remote master and you will have a clean version locally. Please **don't** use the merge button on GitHub. You **need** to verify that the merge works and that button can't do that for you! | This will have it all stored in the remote master and you will have a clean version locally. Please **don't** use the merge button on GitHub. You **need** to verify that the merge works and that button can't do that for you! | ||