Confirmed users
425
edits
Web Testing/Automation/CodeReviewProcess: Difference between revisions
Web Testing/Automation/CodeReviewProcess (view source)
Revision as of 13:11, 18 September 2014
, 18 September 2014→Squashing commits before merging a feature branch
| Line 77: | Line 77: | ||
** <code>git push -f origin my_branch</code> | ** <code>git push -f origin my_branch</code> | ||
* If you are doing this on behalf of someone else, in order to squash their commits before merging, you can merge this new branch into your local master branch and then push the master branch: | * If you are doing this on behalf of someone else, in order to squash their commits before merging, you can merge this new branch into your local master branch and then push the master branch: | ||
<code> | ** <code>git checkout master</code> | ||
git checkout master | ** <code>git pull upstream master</code> | ||
git pull upstream master | ** <code>git merge my_branch</code> | ||
git merge my_branch | ** <code>git push upstream master</code> | ||
git push upstream master | |||
</code> | === Using merge with --squash to squash commits === | ||