Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Step #2: Configure your Git client to map GitHub PRs to ref

Add this the github remote location to your Git config for the Roller a specific Logging Services project. If you already have a remote for GitHub then add the two lines that mention "refs" to it.

       cd into the .git directory inside the project.

       Add the following to the file named "config".

[remote "github"]
url = https://github.com/apache/logging-log4j2
fetch = +refs/heads/*:refs/remotes/github/*
fetch = +refs/pull/*/head:refs/remotes/github/pr/*

...

NOTE: For the rest of this guide we will assume that Apache Git is the remote named "origin" and GitHub is the remote named "github".

...

Next, use the merge command to merge the code into the target branch. And make sure to include a "This closes #" message so that Apache's GitHub integration feature will close the PR. For example:

    git merge -m "ThisCloses closes#<Pull <pullRequest request numberNumber>" pr/<pull request number>

...