Do these 3 things before closing this tab:
1Clear out junk files and repair common Windows errors2Scan for outdated or missing drivers - takes under a minute3Repair Windows errors before they cause bigger problemsYou can edit Markdown notes offline and sync them through GitHub once you’re connected again. Each device keeps a local Git repository; GitHub acts as the shared remote. To avoid overwriting work, fetch and pull remote changes before pushing yours, and review conflicts when edits overlap. A three-way merge can combine independent changes, but it cannot guarantee that every concurrent edit will merge cleanly.
How offline-first Markdown sync with GitHub works
“Offline-first” means your notes remain available as local files and you can edit them without a network connection. Git can also record commits locally while you’re offline. GitHub is the remote location devices use to exchange those commits; it is not what makes local editing possible. The remote exchange must wait until you have connectivity.
As an Amazon Associate I earn from qualifying purchases.
For GitHub Desktop, the usual cycle is to check the remote, bring its changes into your local branch, resolve any conflicts, and then publish your result. The direction matters: pulling changes your local branch; it does not update GitHub. Pushing sends your local commits to GitHub.
The Tool Desk
Outbyte PC Repair FREERepair Windows errors before they cause bigger problemsFix Now →Outbyte Driver Updater FREEScan for outdated or missing drivers - takes under a minuteDriver Scan →The GitHub Desktop cycle
- Fetch origin. This checks for remote commits without bringing them into your local branch.
- Pull origin or use Pull with rebase to bring remote changes into your local branch. Choose the option available in your workflow.
- Resolve conflicts, if needed. Review the affected files and decide what the final note should contain. GitHub Desktop allows conflict resolution in an editor, the command line, or another tool.
- Push origin. This publishes your local commits to GitHub so another device can fetch them.
GitHub Desktop will not merge a branch while conflicts remain unresolved. Treat review as a normal part of the workflow—not as proof that your notes have been lost. GitHub’s guide, Syncing your branch in GitHub Desktop, describes this process.
#1 Best Overall
Will Git merge two edits to the same Markdown note?
It can, but the result depends on what changed and on the client doing the merge. A three-way merge compares three versions: the shared ancestor, the version changed on one device, and the version changed on the other. The ancestor lets the merger distinguish new edits from unchanged text.
When edits are separate
If two devices edit different parts of a note, a text-aware merger may be able to keep both changes. For example, one device might revise a paragraph near the top while another adds a separate paragraph at the end. Whether the merge succeeds depends on the client and the actual changes.
When edits overlap—or the common base is missing
If both devices change the same sentence, the merger may not be able to determine which wording you intended. You must inspect the result and choose what to keep. A missing common ancestor can also prevent a safe automatic merge.
Recommended Free Tools
Behavior is not universal across Git clients or sync tools. One self-hosted Obsidian project documents attempting a three-way text merge when it knows the common ancestor, and creating a separate conflict copy or requiring a choice when it cannot safely merge. Those are that project’s rules, not a guarantee for GitHub or for every Obsidian plugin.
Rank #3
How a dedicated sync service can behave differently
A sync service may merge content using rules that differ from Git’s. Obsidian Sync’s help documentation says it uses Google’s diff-match-patch algorithm for Markdown conflicts and last-modified-wins for other file types, including canvas files. It offers automatic merging or creation of a conflict file. Its documentation warns that automatic merging can produce duplicate text or formatting problems.
The Obsidian Sync conflict setting is device-specific, so configure it on each device. These rules describe Obsidian Sync only; they should not be assumed to apply to GitHub, Git itself, or a third-party plugin.
Choosing between GitHub and a dedicated sync service
| What to compare | Git with GitHub | Dedicated sync service |
|---|---|---|
| Offline work | Work with the local repository while offline; exchange changes with GitHub after reconnecting. | Depends on how the service stores and exposes local files on each platform. |
| Conflict handling | A Git client may merge text against a common base and stop for unresolved overlaps. Check the client’s behavior. | Rules may include content-aware merging, last-write-wins, or conflict copies. Check the rules for each file type. |
| History and recovery | Git commits provide a history model. Recovery depends on how you use the repository and maintain backups. | Check whether version history is offered, how long it is retained, and what restore controls are available. |
| Mobile support | Check the exact editor, Git client or plugin, and authentication route on the mobile platforms you plan to use. | Check offline behavior and file access on each mobile operating system. |
| Privacy and security | Review repository visibility and token handling, and determine whether notes or metadata are encrypted. | Review encryption, key ownership, and what content or metadata the service can access. |
| Effort | Requires learning a sync cycle and sometimes resolving conflicts with Git or a compatible client. | May require less Git knowledge, but conflict behavior may be less controllable. |
A 2019 paper on local-first software described Git as offline-capable and locally controlled, while noting that Git is optimized for line-based text and that mobile support was weak at the time. That mobile observation is historical, not an assessment of current apps or plugins. An Obsidian plugin listing shows that mobile options exist, but a listing alone does not establish identical behavior across platforms or features.
Windows Errors? Fix Them Before They Spread
Repair common Windows errors and clear accumulated junk for a smoother, more stable PC - no reinstall needed.Free scan · no reinstallCrashes, No Sound, or Screen Glitches?
Random freezes, missing sound and display glitches usually trace back to one bad driver. Find and replace yours safely.Free scan · under a minuteWhat to check in an Obsidian GitHub plugin
The Git Vault Sync plugin listing describes a one-click stage, commit, fetch, merge, and push flow, with options to keep the local version, keep the remote version, or edit the merged result when a conflict occurs. That convenience does not itself establish how safely a plugin handles credentials. The listing also states that a personal access token is stored in plaintext in the plugin’s local data file. Review the current listing and token guidance before relying on the plugin, and protect the device that stores the token.
Separately, a self-hosted Obsidian project documents queuing changes locally before network calls, retaining offline edits after app termination, and encrypting content and paths. These are claims about that specific project; they do not establish that GitHub-backed plugins encrypt notes or paths in the same way.
Test the workflow before trusting it with important notes
Use a disposable repository and sample notes first. Test the editor, sync client or plugin, authentication method, and mobile platforms you actually intend to use.
Quick Recap
- Turn off the network, edit a note, close the app, reconnect, and confirm the edit remains and can be synchronized.
- On two devices, edit separate paragraphs in the same note. Sync both and inspect whether both changes appear correctly.
- Repeat with both devices changing the same sentence. Check whether the tool presents a conflict, creates a conflict file, or produces a merged result that needs correction.
- Test deleting a note on one device while editing it on another. Check what survives and how the tool signals the disagreement.
- Rename a note on one device while changing its contents on another. Confirm whether the rename and edit are both retained.
- On each intended mobile platform, verify offline access, sync behavior, and the GitHub authentication route for the specific client and version you will use.
- Inspect where credentials are stored, who can access the repository, and whether the protection you need covers note contents and metadata.
- Practice restoring a note from history or backup. Keep an independent backup while learning; version control is useful history, but a backup and restore procedure still need to be verified.
Product prices and availability are accurate as of the date/time indicated and are subject to change. Any price and availability information displayed on Amazon at the time of purchase will apply.
