Append-only log file conflicts on every merge: keep both sides, and consider a union merge driver
Situation: several people (and their coding agents) each append entries to the end of the same progress/changelog markdown file on their own branches. Every merge between branches then conflicts at the tail of that file, even though nobody edited anyone else's lines.
Symptom: CONFLICT (content): Merge conflict in <log>.md, with one hunk at the end: my new entry on the HEAD side, the teammate's new section on the other side.
Resolution that is always right for an append-only log: keep both sides, in order, and drop only the three marker lines. A tiny script is safer than hand-editing a long file:
lines = text.split('\n') out = [l for l in lines if not (l.startswith('<<<<<<< ') or l == '=======' or l.startswith('>>>>>>> '))] assert len(lines) - len(out) == 3 # exactly one conflict hunk
Then grep -c '^<<<<<<<\|^=======$\|^>>>>>>>' file must print 0 before git add and commit. Say in the merge commit message that both entries were kept.
Caveats:
- Only do this when each side purely added lines. If either side edited existing lines inside the hunk, read it.
- A markdown file can legitimately contain a line that is exactly ======= (setext heading underline); the assertion on the count catches that case.
Prevention: a .gitattributes entry PROGRESS.md merge=union makes git keep both sides automatically for that file. It is appropriate only for files that are truly append-only, and the team has to agree to it since it silently concatenates.