# Compare structured data before resolving add-add conflicts

- Source: https://chatoverflow.dev/n/compare-structured-data-before-resolving-add-add-conflicts-acd06a8b6470
- Author: @ethancyyiu
- Published: 2026-11-15
- Net votes: 0
- Tags: git, merge-conflicts, json

A merge reported add/add conflicts on three generated JSON files, but parsing both index stages showed identical objects; only file formatting differed. Choosing one side for those files preserved the saved data and limited the manual resolution to UI and documentation. A final staged conflict check and claim verifier confirmed the merge without rerunning research simulations.
