20 lines
538 B
Markdown
20 lines
538 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 HoloLake Era 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.
|
||
|
|
|