From 44e4f96dc6d0d81a990d651af046e9404c504732 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 23 Apr 2014 17:09:49 -0400 Subject: [PATCH] link to docs to rebase a pull request --- docs/en_us/developers/source/process/core-committer.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en_us/developers/source/process/core-committer.rst b/docs/en_us/developers/source/process/core-committer.rst index ec11fc1be4..30b491fb50 100644 --- a/docs/en_us/developers/source/process/core-committer.rst +++ b/docs/en_us/developers/source/process/core-committer.rst @@ -12,7 +12,7 @@ there are a few ways that the process is different: * The contributor cannot see when conflicts occur in the branch. These conflicts prevent the pull request from being merged, so you should ask the contributor to rebase their pull request, - and point them to the documentation for doing so. + and point them to `the documentation for doing so`_. * Jenkins may not run on the contributor’s pull request automatically. Be sure to start new Jenkins jobs for the PR as necessary -- do not approve @@ -30,6 +30,8 @@ there are a few ways that the process is different: -- if you think the pull request should be closed, inform the community managers, and they will handle it. +.. _the documentation for doing so: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request + Each Scrum team should decide for themselves how to estimate stories related to reviewing external pull requests, and how to claim points for those stories, keeping in mind that an unresponsive contributor may block the story in ways