> On Jun 26, 2017, at 10:46 PM, Jason Litzinger wrote:
>
> On Mon, Jun 26, 2017 at 02:23:24PM -0400, Glyph wrote:
>> The comment about rebasing predates our current process; it was from the
>> days when we were using SVN. Nowadays we usually just merge trunk in to the
>> branch.
>
> Yikes, d
On Mon, Jun 26, 2017 at 02:23:24PM -0400, Glyph wrote:
> The comment about rebasing predates our current process; it was from the days
> when we were using SVN. Nowadays we usually just merge trunk in to the
> branch.
Yikes, definitely didn't do that on the PR above, will from now on.
If that
> On Jun 25, 2017, at 11:34 PM, Jason Litzinger wrote:
>
> Hello,
> Quick question regarding #15 of
> https://twistedmatrix.com/trac/wiki/TwistedDevelopment#SubmittingaPatch.
>
> The step indicates that history shouldn't be re-written and the branch
> should be rebased over trunk. Pretty strai
On Mon, 26 Jun 2017 at 05:34 Jason Litzinger
wrote:
> However, after incorporating review comments in new commits and,
> force-pushing the feature branch, is it expected that the review comments
> may
> be damaged?
>
I think this is expected; this is just an unfortunate shortcoming of GitHub
PR
