---
title: Note Version History & Merging
category: History & Merging
icon: "\U0001F552"
sort_order: 5
slug: version-history-and-merging
canonical_url: 'https://basaltnotes.com/guides/version-history-and-merging'
markdown_url: 'https://basaltnotes.com/guides/version-history-and-merging.md'
---
# Note Version History & Merging

Track note revisions, view file histories, and reconcile conflict edits through three-way merging.

## Viewing Version History

1. Open the note you wish to inspect.
2. Click the **History** clock icon in the top header.
3. This slides open the **Version History Panel**, showing a list of recent edits, edit timestamps, and authors.
4. Select any revision to preview its content and see a diff compared to your current note version.

## Reconciling Conflicts (Three-Way Merging)

If you modify a note on two devices offline (or during a multiplayer session):
- Basalt detects the sync conflict.
- It displays the conflict resolution wizard.
- You can review your changes, their changes, and the original version.
- Use the visual editor to select specific blocks, merge them, or overwrite one version completely.