There is a set of merging rules that can be summarized as ‘can merge as long as they don’t consume the same linear event', or ‘the pink “if different linear” cells in Mike’s ￼ sheet’. They correspond to cases dubbed COULD_MATCH_SAME in MultiParentCasperMergeSpec. Once we have COMM.direction in the event log (see ), we have all the information needed to implement them (they base on the event type, the COMM.direction, and the (linear) event identity (hash)).
All cases dubbed COULD_MATCH_SAME have merges instead of conflictsForNow
there are conflicts test cases for all cases of COULD_MATCH_SAME that have no linear events waiting in the TS