9b41d51231
Some checks are pending
Auto-update PR branches / Update open PR branches (push) Waiting to run
CI / Frontend Static Quality Checks (push) Waiting to run
CI / Frontend Tests & Coverage (push) Waiting to run
CI / Rust Tests & Quality Checks (push) Waiting to run
CI / Linux build verification (push) Waiting to run
Deploy docs / Build VitePress site (push) Waiting to run
Deploy docs / Deploy to GitHub Pages (push) Blocked by required conditions
Release (Alpha) / Compute alpha version (push) Waiting to run
Release (Alpha) / Build release artifacts (push) Blocked by required conditions
Release (Alpha) / GitHub Release (alpha) (push) Blocked by required conditions
Release (Alpha) / Update docs and release pages (push) Blocked by required conditions
Source snapshot: 514ab1975951d94342ea38e64101d5a0f1c51c77
21 lines
533 B
Markdown
21 lines
533 B
Markdown
# Sync Conflicts
|
|
|
|
Sync conflicts happen when local and remote changes touch the same content.
|
|
|
|
## What To Do
|
|
|
|
1. Stop editing the conflicted note.
|
|
2. Open the conflict resolver if Tolaria presents it.
|
|
3. Review both sides.
|
|
4. Choose the correct content or merge manually.
|
|
5. Commit the resolved file.
|
|
6. Push again.
|
|
|
|
## 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.
|
|
|