This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revision | Next revisionBoth sides next revision | ||
| test:pullrequests [2013/07/18 10:18] – rhauck | test:pullrequests [2013/07/18 12:29] – Added note about the non-fatal bookmarks error rhauck | ||
|---|---|---|---|
| Line 15: | Line 15: | ||
| - 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. | ||
| + | * :!: Note: You may see a message like: < | ||
| - (Optional) To confirm you've pulled the changes from Github, compare your two local clones. < | - (Optional) To confirm you've pulled the changes from Github, compare your two local clones. < | ||
| - Merge those commits < | - Merge those commits < | ||