Merge multiple branches

[Dickels112 (Dick Elsman)]

This functionality is also necessary to facilitate the workflow i described here.

For merging, we can assume: ‘an element is always overwritten by the version in the latest commit’

Speckle projects

Once again, I did some thinking about the ‘speckle projects’, now starting from the commits, and I came up with a new scenario, keeping in mind the ISO19650 as well. (This is going to be a long entry, sorry. TLDR in the end of the post) In my opinion ISO19650 roughly states the following (keeping this in lame-man’s terms): Next, looking at the commits on Speckle, I identified the following: Knowing this, it we can state: Let’s say each team itself works on 1 stream, as it is only allowed to…