<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<br>
<br>
<div class="moz-cite-prefix">On 2020-02-06 12:54 π.μ., Ryan Sleevi
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CACvaWva755o-XcqenSn8avuQBC2oBQsJziVX38mpV-q15QBv3w@mail.gmail.com">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<div dir="ltr">
<div dir="ltr"><br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Tue, Feb 4, 2020 at 10:06
AM Ryan Sleevi <<a href="mailto:sleevi@google.com"
moz-do-not-send="true">sleevi@google.com</a>> wrote:</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">
<div dir="ltr">
<div class="gmail_quote">
<div>That said, going forward, I agree we've got options
and can do better here :)</div>
</div>
</div>
</blockquote>
<div><br>
</div>
<div>Dimitris: Here's an example (attached) of <a
href="https://github.com/cabforum/documents/pull/158"
moz-do-not-send="true">https://github.com/cabforum/documents/pull/158</a></div>
<div><br>
</div>
<div>Is the idea that folks would attach these patch files?</div>
</div>
</div>
</blockquote>
<br>
Yes, that's what I had in mind. We could add it on the wiki too
(<a class="moz-txt-link-freetext" href="https://wiki.cabforum.org/scwg/scwg_ballots">https://wiki.cabforum.org/scwg/scwg_ballots</a> and
<a class="moz-txt-link-freetext" href="https://wiki.cabforum.org/ballots">https://wiki.cabforum.org/ballots</a>). I know these seem kind of
outdated but me and - I hope - Wayne can work on updating the tables
with the proper links.<br>
<br>
<blockquote type="cite"
cite="mid:CACvaWva755o-XcqenSn8avuQBC2oBQsJziVX38mpV-q15QBv3w@mail.gmail.com">
<div dir="ltr">
<div class="gmail_quote">
<div><br>
</div>
<div>In this PR's example, there are several merges from
re-integrating master, leading to the correct response to be
a "squash and merge". One possible path forward is:</div>
<div>1) Create a branch on cabforum/documents (e.g. call this
branch "SC27")</div>
<div>2) Squash and merge from Wayne's branch *into the SC27
branch*</div>
<div>3) That will create a single commit, which we can then
download as a 'clean' patch/red line against the current
master</div>
<div><br>
</div>
<div>If you'd like to see what that looks like, let me know,
and I'll perform the steps to do that.</div>
</div>
</div>
</blockquote>
<br>
Sounds good to me.<br>
<br>
<br>
</body>
</html>