Both sides had edited the same project files from a common base. Conflicts
are resolved in favour of dt's copy: it carries the newer schema
(the app migrates .hincproj on load and writes it back) and it is what the
running HiNC-1 services actually use. Gitea's side of each conflicted file
stays reachable in history, and every file TC added that did not collide is
taken as-is.
Output/S50C-fine.mp: TC deleted it, dt still had edits -- dt's file kept
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
iambossandClaude Opus 5
fa61b6c4db