On 24/09/2012 06:19, Logan Bell wrote:
I'm a little bit confused about the workflow in regard to pull requests. Is
it possible for us to accept pull requests into the apache project or do we
have to manually merge them into a local git repo and push back to apache?
The merge has to be done manually. This is easy if we're OK with
non-linear commit history or the pull request is based on the latest commit:
git checkout master
git pull $repo_url $remote_branch
[ handle merge conflicts ]
git push origin master
Otherwise, you'll have to fetch the remote branch and rebase it against
master. This is more complicated:
# Fetch from remote repository
git fetch $repo_url $remote_branch:temp_branch
git checkout temp_branch
# Rebase
git rebase master
[ handle rebase conflicts ]
# Merge and push
git checkout master
git merge temp_branch
git push origin master
# Cleanup
git branch -d temp_branch
Nick
