- From: David Dorwin <ddorwin@google.com>
- Date: Thu, 2 Jun 2016 16:00:02 -0700
- To: public-hme-editors@w3.org
- Message-ID: <CAHD2rsiHZew_mqicCRBSPMe0i4DGbUKwV65XYYkVi66wgM16qw@mail.gmail.com>
I added an outline of the new best practices in https://github.com/w3c/encrypted-media/issues/214. FYI, merging generated files can problems even when there is no merge conflict. For example, https://validator.w3.org/nu/?doc=https%3A%2F%2Fw3c.github.io%2Fencrypted-media%2F currently shows the following. This will be resolved next time we generate and commit 1. *Error*: Duplicate ID h-note74. From line 4349, column 11; to line 4349, column 85 <div class="note-title marker" aria-level="5" role="heading" id="h-note74"><span> 2. *Warning*: The first occurrence of ID h-note74 was here. From line 4321, column 15; to line 4321, column 89 <div class="note-title marker" aria-level="5" role="heading" id="h-note74"><span> On Wed, Jun 1, 2016 at 2:07 PM, David Dorwin <ddorwin@google.com> wrote: > More specifically, you probably want to: > > 1. Clean up the single line field - the bold text. > 2. Delete all text from the text box below it (unless there was some > useful additional information). > > > On Wed, Jun 1, 2016 at 1:52 PM, David Dorwin <ddorwin@google.com> wrote: > >> I was trying to clean up the commit message in the text box that pops up >> when you click the green "Confirm squash and merge" button, but it looks >> like I have been unsuccessful. It looks like a couple of Mark's recent >> commits had similar issues. >> >> I believe the problem is that the text box defaults to only a couple >> lines but copies of the message for each commit appear in subsequent lines. >> So, remember to delete any extra lines when merging. >> > >
Received on Thursday, 2 June 2016 23:00:49 UTC