Hi,

Our PR process (applies to committers but anyone else is welcome to
weigh in) says to download the patch file from GitHub and apply the
patch using the `git am` command.

I find git am to be so fragile, typically I use the --3way flag to
help it try and resolve conflicts but normally is just stumbles on the
slightest issue.

The new process I've been using is :

git fetch https://github.com/<remote user>/libcloud <remote-branch>:github-<pr>
git merge <github-pr>

.. edit merge message to included Closes #PR

Then push to apache trunk.

An obvious advantage is that in GitHub the PRs show as merged.
https://github.com/apache/libcloud/pull/899

The merge tool in git (instead of the patch) is so much more reliable.

What do people think of this approach? Here is an example -
https://github.com/apache/libcloud/commit/065d1919d8cd1e651b92af6220b1408437b07563

Ant

Reply via email to