Date: Sat, 25 Apr 2015 08:30:06 +0100 From: David Chisnall <theraven@FreeBSD.org> To: Craig Rodrigues <rodrigc@FreeBSD.org> Cc: freebsd-git@freebsd.org, freebsd-current Current <freebsd-current@freebsd.org>, ports <freebsd-ports@freebsd.org> Subject: Re: Merging GitHub Pull Requests into Subversion using git-svn Message-ID: <29BE23C6-EBFE-40FB-91FC-C0E7CBFCFD45@FreeBSD.org> In-Reply-To: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com> References: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 23 Apr 2015, at 00:12, Craig Rodrigues <rodrigc@FreeBSD.org> wrote: >=20 > 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). =20 David=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?29BE23C6-EBFE-40FB-91FC-C0E7CBFCFD45>