On 2 June 2017 14:23:30 BST, Christopher Schultz <ch...@christopherschultz.net> 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 .patch to the PR url and GitHub will give you a patch file. >2. Apply the patch to my local svn checkout >3. Commit to svn >4. Reply to PR email saying something like "this closes PR #X" > >Is there a smoother way to do this? Probably, but the process above is what I tend to do. Mark > >Command-line recipes preferred, but I can also use Eclipse if that >helps somehow. > >Thanks, >-chris --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
