Merge Conflict Resolution Notes

This repository now includes a local conflict audit script:

• scripts/maintenance/merge_conflict_audit.sh

The script validates two things:

1. There are no unmerged entries in the git index (git ls-files -u).
2. There are no unresolved merge markers in tracked files: - <<<<<<< ... - ======= - >>>>>>> ...

Usage

scripts/maintenance/merge_conflict_audit.sh

If conflicts are detected, the script exits with a non-zero code and prints exact file/line locations.

Current Local Result

At the time of this update, the local branch has no unmerged index entries and no unresolved conflict markers.