Merge conflicts abound

Hi all,

If you have a pending PR, please check it as many of the PRs that have
been hanging out there for a while now have lots of merge conflicts.

This is happening because Grant Noble is providing excellent editorial
fixes to the document, and those touch large swaths of the document. As
an editor, it is very easy for me to merge Grant's changes (because
they're all editorial and don't require discussion).

I am also attempting to push through other changes that are
editorial/informative.

I know this can be frustrating for those of you that are working on PRs
that are still under discussion... in fact, many of your PRs have
conflicts mere hours after you correct them. There is no easy way to fix
this... it's the log jam that happens when a WG is rushing to get to CR.

If you believe your PR is ready to merge, please let me know in the PR
and make sure you don't have merge conflicts before you ask me to merge
it in.

-- manu

-- 
Manu Sporny (skype: msporny, twitter: manusporny, G+: +Manu Sporny)
Founder/CEO - Digital Bazaar, Inc.
blog: Veres One Decentralized Identifier Blockchain Launches
https://tinyurl.com/veres-one-launches

Received on Friday, 7 December 2018 13:59:44 UTC