This shows you the differences between two versions of the page.
| Next revisionBoth sides next revision | |||
| test:pullrequests [2013/05/28 17:24] – created page for merging PRs rhauck | test:pullrequests [2013/05/29 15:34] – Corrected steps - no need to merge branches rhauck | ||
|---|---|---|---|
| Line 14: | Line 14: | ||
| - In the test-github repository, pull from the repository listed in the Pull Request:< | - In the test-github repository, pull from the repository listed in the Pull Request:< | ||
| * The first time you do this will take a loooong time as it exports the hg data to git format (long as in 3-4 hours, the progress extension helps you see what's going on). This is a one-time operation; subsequent pull requests happen quickly. | * The first time you do this will take a loooong time as it exports the hg data to git format (long as in 3-4 hours, the progress extension helps you see what's going on). This is a one-time operation; subsequent pull requests happen quickly. | ||
| - | * Push the Pull Request branch into the 'test-master' | + | |
| - | - Delete | + | - Merge those commits |
| - | - cd back to the 'test-master' repository and check if the new branch created additional heads:< | + | - Commit |
| - | - If there's only one head, continue to step 10, otherwise, merge the branch:< | + | - Push to the test-master |
| + | - Switch to the root directory of the test-master | ||
| + | - (Optional) To confirm you've pulled the changes from the second local clone, again, compare your two local clones. | ||
| + | - Merge those commits into your test-master clone < | ||
| + | - Commit the merge < | ||
| - Push the changes to the server: < | - Push the changes to the server: < | ||