Re: My action Items

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 14:36:28 UTC