fix(index): ensure we only report added vs added conflict if...

...there are conflicts among the tracked fields of a document
b2ihealthcare · Oct 12, 2023 · 0ec9756 · 0ec9756
1 parent 6a2cd0f
commit 0ec9756
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/commons/com.b2international.index/src/com/b2international/index/revision/StagingArea.java b/commons/com.b2international.index/src/com/b2international/index/revision/StagingArea.java
@@ -959,7 +959,8 @@ private void collectConflicts(RevisionBranchChangeSet fromChangeSet, List<Revisi
 					Revision addedOnTargetObject = addedRevisionsOnTarget.get(revisionId);
 
 					RevisionDiff diff = new RevisionDiff(addedOnTargetObject, addedOnSourceObject);
-					if (diff.hasChanges()) {
+					// check the tracked field diff, not the raw diff
+					if (diff.diff().hasChanges()) {
 						conflicts.add(new AddedInSourceAndTargetConflict(ObjectId.of(type, revisionId)));
 					} else {
 						// ensure we revise the one coming from source (or target?)