Page History

...

1. 1. $ git checkout master
   2. $ git pull upstream master

1. Check out the PR (example #327). This will be in detached-HEAD state. (Note: You may need to edit the .git/config file to add the fetch lines below)

1. 1. $ git checkout github/pr/327

...

2. Create a branch for the PR

1. 1. $ git checkout -b pr327

...

1. Apply the changes and sign off. This could be through a commit --amend, rebase, etc.

1. 1. $ git commit --amend -s
   2. Edit the commit file to contain "This closes #327. "
   3. $ git log
   4. Copy commit id of last commit

...

2. Switch back to the master branch

1. 1. $ git checkout master

...

2. Merge the changes. You can use cherry-pick, merge, etc.

1. 1. $ git cherry-pick <commit id>

...

2. (Optional) Ensure the commit was applied successfully

1. 1. $ git log

1. Push to the Apache repository (master branch)

1. 1. $ git push apache master

...

2. Switch to the support branch

1. 1. $ git checkout -t upstream/0.x

...

2. (Optional) Check the status of the branch

1. 1. $ git log

1. Apply the changes from the PR branch

1. 1. $ git cherry-pick <commit id>

...

2. Push to the Apache repository (support branch)

1. 1. $ git push apache 0.x

Anchor
fetch-config fetch-config

Fetch Config

...