From 023c60b00e88013d5a0d073bb43bd48caa9fc914 Mon Sep 17 00:00:00 2001 From: Felix S Klock II Date: Sat, 21 Feb 2015 10:39:08 +0100 Subject: [PATCH] update for homu-based bors --- Note-git-workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Note-git-workflow.md b/Note-git-workflow.md index d0db864..ea9a29c 100644 --- a/Note-git-workflow.md +++ b/Note-git-workflow.md @@ -41,7 +41,7 @@ $ git push origin mybranch 4. File a pull request against `rust-lang/rust`. Target the pull request to the `master` integration branch in `rust-lang/rust`. Once your pull request is filed, you can create a new branch and do something else. -5. Reviewers regularly look through the @bors integration queue, shown here: http://buildbot.rust-lang.org/bors/bors.html . Monitor your pull request for any additional comments or feedback from reviewers. Once an authorized reviewer leaves a comment of the form `r+` on the end of the final commit in your pull request, @bors will attempt to merge your change to a temporary branch, test it, and advance `master` to that version if the tests pass. If any of these steps fail, it is your responsibility to address any problems that show up and refresh the pull request with updated code, so watch this process to ensure your change integrates. +5. Reviewers regularly look through the @bors integration queue, shown here: http://buildbot.rust-lang.org/bors/bors.html . Monitor your pull request for any additional comments or feedback from reviewers. Once an authorized reviewer leaves a comment on your pull request of the form `@bors r+ ` (referring to the final commit in the pull request), @bors will attempt to merge your change to a temporary branch, test it, and advance `master` to that version if the tests pass. If any of these steps fail, it is your responsibility to address any problems that show up and refresh the pull request with updated code, so watch this process to ensure your change integrates. 6. Pull `master` into your local repo and verify that it contains your changes: ```