Merging GitHub Pull Requests into Subversion using git-svn
theraven at FreeBSD.org
Sat Apr 25 07:30:20 UTC 2015
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).
More information about the freebsd-ports