- From: David MacDonald <david100@sympatico.ca>
- Date: Tue, 24 Apr 2018 12:17:52 -0400
- To: Alastair Campbell <acampbell@nomensa.com>
- Cc: WCAG <w3c-wai-gl@w3.org>
- Message-ID: <CAAdDpDZoaJZsNSZYtdBKg0OH1rgZPziU_a4p_qf7OEE7S9tFNw@mail.gmail.com>
Is there anything that needs to be done with the existing PRs? https://github.com/w3c/wcag21/pull/871 https://github.com/w3c/wcag21/pull/872 https://github.com/w3c/wcag21/pull/870 Cheers, David MacDonald *Can**Adapt* *Solutions Inc.* Tel: 613.235.4902 LinkedIn <http://www.linkedin.com/in/davidmacdonald100> twitter.com/davidmacd GitHub <https://github.com/DavidMacDonald> www.Can-Adapt.com <http://www.can-adapt.com/> * Adapting the web to all users* * Including those with disabilities* If you are not the intended recipient, please review our privacy policy <http://www.davidmacd.com/disclaimer.html> On Tue, Apr 24, 2018 at 10:35 AM, Alastair Campbell <acampbell@nomensa.com> wrote: > Hi David, > > > > > What should be done when the Understanding Branch is behind the master? > > > > Michael may correct me, but I don’t think it matters that the > understanding branch is behind master, the key is that each understanding > branch was taken from master at a particular point. If the edits in that > branch are confined to the understanding doc, we won’t get clashes. > > > > If people branch off master at *different* points and merge changes into > master, it gets very messy. (I did this previously!) > > Unrelated updates get merged in, and merged in again from another branch > at a different stage, and again… they overlap a lot. > > > > It’s a case of “don’t cross the streams”! > > > > -Alastair >
Received on Tuesday, 24 April 2018 16:18:17 UTC