Re: Merging GitHub Pull Requests into Subversion using git-svn

From: David Chisnall <theraven_at_FreeBSD.org>
Date: Sat, 25 Apr 2015 08:30:06 +0100
On 23 Apr 2015, at 00:12, Craig Rodrigues <rodrigc_at_FreeBSD.org> wrote:
> 
> While not as smooth as clicking a merge button in GitHub,
> this is a valid way to accept patches submitted via GitHub pull requests,
> and integrate them in our FreeBSD Subversion repo.

The merge button on GitHub does the wrong thing anyway (merges without fast-forward, so you end up with a tangled history), so (after the initial setup) the steps that I use for merging pull requests from GitHub projects are very similar (locally pull the branch with fast-fordward, test, push).  

David
Received on Sat Apr 25 2015 - 05:30:19 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:57 UTC