Apache Stratos Git repository is the main repository. While, the Stratos GitHub repository is a mirror of the Apache Stratos Git repository. Therefore, committers will always have to commit their changes to the Apache Stratos Git repository. Therefore, when merging pull requests, GitHub needs to be configured as the remote repository and the Apache Stratos repository needs to be configured as the origin repository.

Follow the instructions below to fetch GitHub pull requests into your local repository and push them back into the Apache Stratos Git repository:

Note that you need to be a committer to be able to carryout the following actions.

  1. Clone the Apache Stratos Git repository.

    git clone https://git-wip-us.apache.org/repos/asf/stratos.git <LOCAL_FOLDER_NAME>

     

  2. Add a remote reference to the mirrored GitHub repository.

    git remote add github https://github.com/apache/stratos.git

  3. Fetch the pull request. Replace <PULL_REQUEST_NUMBER> with the required value.

    git fetch github pull/<PULL_REQUEST_NUMBER>/head:<NEW_BRANCH_NAME_IN_LOCAL_REPO> 

  4. Checkout the new branch to your local repository.

    git checkout <NEW_BRANCH_NAME_IN_LOCAL_REPO>

  5. Review the changes done in the pull request branch.

  6. If you are satisfied with the modifications, you can carryout one of the following actions:

    • Push the commits on the new branch to master: 

      git push origin <NEW_BRANCH_NAME_IN_LOCAL_REPO>:master

    • Push the commits on the new branch to another branch (e.g. 4.1.0):

      git push origin <NEW_BRANCH_NAME_IN_LOCAL_REPO>:4.1.0
  • No labels