-----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. Grab the PR and convert it into 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?

Command-line recipes preferred, but I can also use Eclipse if that
helps somehow.

Thanks,
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZMWbSAAoJEBzwKT+lPKRYa94QAMDkr4INaaP5NZPGuFefNTl5
aedKKjZ5EmpYFUbL18F4hqXxcYkK41UTvY3vDVjehKjQEoaP2g3Zwla34dCDzV7t
KE1wnXjb46Ej2bNvlN7LVDUclmeRrgSY7pSTUsEILOyTHfQ/74uDO5fV0o2rnyuK
CipY4B9aAVt957ejmITjuN/nTCQcR8Fg6d4hjjGbH8hN8G9W5Y1iXyFCjF5e5a0x
4tijqlgkVRJ6CbpE7z0QjGebvMZ3WjXIf2G41ZJKrqXP94/Rx+GGdlteXwe9f9IR
yCAnc4DCo1xIXp4A4CAA4Z+qGInDmZlrCkyPWCLFavQh8UpYUJdH0YVmdSHjw79K
6h7Ont4t1y1nan1m5LZlpvpnHeUljJ7vnQ0moBMGurfiHHfyiCY2I/Tw9A/7jJrL
4Eog+D6RbCsbVclb8fML8EpNGXtRPscGN39Td/AIOho+4aY+rRZWFt8PlDKj8XUX
FK2rJfbhd6KH6QDicNpadpAOegwzePVrxpKRGVNc6bYVFTnfRNHtERZUHbTv3Sd0
ni6lbVVL2LPRYgn/mHcDAtWk0Qj4172mVKRhY+Um/VcivSKj5o2Wy9FT6ydVDC+m
XeD8MdRx59cuqjJZy10nGwB12/M0UCOabrvGdiVDGwT5XGWKpy7flxsWJrByEqZY
SeQ6WAgmTeftrH1E1nkK
=b7Fb
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to