Sync conflicts
Sync conflicts happen when local and remote changes touch the same content.
What to do
Section titled “What to do”- Stop editing the conflicted note.
- Open the conflict resolver if Rhizome presents it.
- Review both sides.
- Choose the correct content or merge manually.
- Commit the resolved file.
- Push again.
Prevent conflicts
Section titled “Prevent conflicts”- Pull before starting work on another device.
- Push after meaningful sessions.
- Keep AI-generated edits in small commits.
- Avoid editing the same note on multiple devices at the same time.