From cf111524a7d2766be0d85079ae49ada1778ea151 Mon Sep 17 00:00:00 2001 From: Pravin Satpute Date: Jun 22 2017 11:32:32 +0000 Subject: [PATCH 1/2] Updated documentation for pagure to pagure pull requests --- diff --git a/doc/usage/pull_requests.rst b/doc/usage/pull_requests.rst index f3a9a0a..cb4c252 100644 --- a/doc/usage/pull_requests.rst +++ b/doc/usage/pull_requests.rst @@ -13,19 +13,39 @@ proposed. Open a Pull Request ------------------- + Before you can open a pull request, you need to complete the :ref:`first-steps` and :ref:`create-fork` of the project you would like to contribute to. Once you have a fork and you have pushed a `git branch `_ containing one or more `commits `_, you are -ready to contribute to the project. Navigate to the project's Pull Request page -and click on the ``File Pull Request`` button. +ready to contribute to the project. + +Pagure to Pagure PR +^^^^^^^^^^^^^^^^^^^ + +If you are creating pull request from pagure project, use following steps + +1. After you done the changes and push it to repo. Go to "commit" tab of your forked project. + +2. Find "create pull request" button above the your latest commit. + +3. Just click it and follow the next steps. + +Pagure to Remote Git PR +^^^^^^^^^^^^^^^^^^^^^^^ + +If you are creating pull request from other git repositories like github or gitlab, +use following steps + +1. Navigate to the main project's Pull Request and click on the ``File Pull Request`` button. + +2. A dropdown menu should appear containing the git branches in your fork. -A dropdown menu should appear containing the git branches in your fork. Select the -branch containing your changes. You will be taken to a page where you can customize -the title of your Pull Request and its description. By default, this is populated -using your commit message. +3. Select the branch containing your changes. You will be taken to a page where you can customize + the title of your Pull Request and its description. By default, this is populated + using your commit message. -Once you are satisfied with your title and description, click ``Create``. +3. Once you are satisfied with your title and description, click ``Create``. Congratulations! It is now up to the project maintainer to accept your changes by merging them. From 0d476c9ff219fd67df43ada11432bf04964d7d4f Mon Sep 17 00:00:00 2001 From: Pravin Satpute Date: Jun 29 2017 15:10:56 +0000 Subject: [PATCH 2/2] Updated as per review comments. --- diff --git a/doc/usage/pull_requests.rst b/doc/usage/pull_requests.rst index cb4c252..e986fce 100644 --- a/doc/usage/pull_requests.rst +++ b/doc/usage/pull_requests.rst @@ -23,13 +23,32 @@ ready to contribute to the project. Pagure to Pagure PR ^^^^^^^^^^^^^^^^^^^ -If you are creating pull request from pagure project, use following steps +If you are creating pull request from pagure project, use the following options -1. After you done the changes and push it to repo. Go to "commit" tab of your forked project. +From "commit" tab +***************** + +1. Go to the "commit" tab of your forked project. 2. Find "create pull request" button above the your latest commit. -3. Just click it and follow the next steps. +3. Click it and follow the next steps. + +From "overview" tab +******************* + +1. Right hand side, find the button **New PR** next to your branch. + +2. Button appears only if there are commits not available in the main branch. + +3. Click on it and follow the next steps. + + +File Pull Request +***************** + +This is same as given in "Pagure to Remote Git PR" section. +More information in next section Pagure to Remote Git PR ^^^^^^^^^^^^^^^^^^^^^^^ @@ -37,6 +56,9 @@ Pagure to Remote Git PR If you are creating pull request from other git repositories like github or gitlab, use following steps +File Pull Request +***************** + 1. Navigate to the main project's Pull Request and click on the ``File Pull Request`` button. 2. A dropdown menu should appear containing the git branches in your fork.