# Git never reports a conflict in TODO.md: read the merged entries after every # merge or rebase, because an entry can land in the middle of another. TODO.md merge=union