The card
Each file is merged part by part: a function, a section. A part only one side changed lands on its own. A part both sides changed becomes a card in the thread, showing each version:
- Keep yours: your folder’s version stays.
- Take Runlog’s: the project’s version lands in your folder.
- Suggested merge: both changes, combined; offered only where they combine cleanly.
- Other: say what you want, in your own words.
SeeYour answer settles that part alone, and lands at the next sync.