Re: Merging GitHub PR into svn

2017-06-02 Thread Violeta Georgieva
2017-06-02 16:52 GMT+03:00 Christopher Schultz : > > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Violetta, > > On 6/2/17 9:43 AM, Violeta Georgieva wrote: > > 2017-06-02 16:23 GMT+03:00 Christopher Schultz > > >> : > >> > > All, > > > > I've never done this before, and my git-fu is not s

Re: Merging GitHub PR into svn

2017-06-02 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Violetta, On 6/2/17 9:43 AM, Violeta Georgieva wrote: > 2017-06-02 16:23 GMT+03:00 Christopher Schultz > > : >> > All, > > I've never done this before, and my git-fu is not strong. > > What's the best way to take a GitHub PR and merge it into e.g

Re: Merging GitHub PR into svn

2017-06-02 Thread Violeta Georgieva
2017-06-02 16:23 GMT+03:00 Christopher Schultz : > > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > All, > > I've never done this before, and my git-fu is not strong. > > What's the best way to take a GitHub PR and merge it into e.g. Tomcat > trunk? I can definitely do it like this: > > 1. G

Re: Merging GitHub PR into svn

2017-06-02 Thread Mark Thomas
On 2 June 2017 14:23:30 BST, Christopher Schultz wrote: >All, > >I've never done this before, and my git-fu is not strong. > >What's the best way to take a GitHub PR and merge it into e.g. Tomcat >trunk? I can definitely do it like this: > >1. Grab the PR and convert it into a patch file Add .pa