entity: make sure merge commit don't have operations

1 files changed, 4 insertions, 0 deletions

diff --git a/entity/dag/entity.go b/entity/dag/entity.go
index 196280a8..c4368514 100644
--- a/entity/dag/entity.go
+++ b/entity/dag/entity.go
@@ -148,6 +148,10 @@ func read(def Definition, repo repository.ClockedRepo, resolver identity.Resolve
 			return nil, err
 		}
 
+		if isMerge && len(opp.Operations) > 0 {
+			return nil, fmt.Errorf("merge commit cannot have operations")
+		}
+
 		// Check that the create lamport clock is set (not checked in Validate() as it's optional)
 		if isFirstCommit && opp.CreateTime <= 0 {
 			return nil, fmt.Errorf("creation lamport time not set")