# Sync a writing project between two Macs and resolve conflicting edits

Keep one Markdown writing project on two Macs with Flywrite and GitHub: clone it, Sync when you switch, and choose between both versions when edits clash.

**The short version:** Put the project in a private GitHub repository, then open it on the second Mac with Flywrite's **Clone from GitHub**. Press Sync (`⌘⇧S`) before you leave one Mac and again when you sit down at the other. If both Macs changed the same paragraph, Flywrite shows both versions side by side and you keep one or merge them.

We make Flywrite, the Markdown writing app these steps use. The steps follow Flywrite's docs and app, and the merge examples in step 5 were run with Git itself.

## What you'll need

- Two Macs with Flywrite, on one license: a seat activates Flywrite on up to 3 devices ([Licenses & devices](/docs/licenses-and-devices)).
- Your project in a private GitHub repository, synced from the first Mac. If it isn't there yet, follow [Back up Markdown projects to GitHub](/guides/back-up-markdown-to-github) first.
- Git on the second Mac. Flywrite uses the Mac's own Git: type `git --version` in Terminal, and if Git isn't installed, the Mac offers to install the Xcode Command Line Tools, which include it ([Pro Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)).
- That Mac's Git signed in to GitHub. Flywrite has no GitHub login of its own. Set up GitHub CLI (`gh auth login`) or Git Credential Manager once, as [GitHub's guide](https://docs.github.com/en/get-started/git-basics/caching-your-github-credentials-in-git) shows.

## Do it step by step

By the end, the same files are on both Macs, one Sync carries your work across each time you switch, and you know what each conflict choice does.

1. **Sync on the first Mac before you leave it.** Press `⌘⇧S`, or click **Sync** in the top bar (Flywrite's default shortcut; [every one is customizable](/docs/keyboard-shortcuts)). One action saves a checkpoint, pulls anything new and pushes your work to GitHub.

   ```text
   ⌘⇧S   Sync Project
   ```

   You should see a notification that starts "Synced ·".

2. **Clone the project on the second Mac.** In Flywrite, click **+** at the foot of the project list, choose **Clone from GitHub** and paste the repository's address. Keep **Clone inside of** on `~/Projects`, or pick another folder iCloud Drive doesn't sync: use one sync method per folder, since Apple warns that another sync service can interfere with iCloud Drive's ([Apple's guide](https://support.apple.com/guide/mac-help/use-icloud-drive-to-store-documents-mchle5a61431/mac)). Then click **Clone**.

   ```text
   GitHub URL
   https://github.com/you/weekend-gardener.git
   Clone inside of
   ~/Projects
   ```

   You should see the project open with the same files as on the first Mac. The address above is an example.

3. **Write, then Sync before you walk away.** Work on the second Mac as you would on the first. When you stop, press `⌘⇧S` so your changes go up to GitHub.

   ```text
   issues/2026-11-14-issue-43.md
   Plant garlic before the frost.
   ```

   You should see "Synced ·" and how many commits went up. The issue file is an example.

4. **Bring the work down on the first Mac.** Flywrite checks GitHub when you open the project, when you switch back to the app and every few minutes, and tells you when new work is waiting. Your files change only when you press `⌘⇧S`.

   ```text
   Remote has 1 new change —
   Sync (⌘⇧S) to pull
   ```

   You should see the second Mac's edit in the file after you Sync.

5. **If both Macs changed the same paragraph, read both versions.** Git, which Flywrite's Sync runs, combines edits to different parts of a file and stops only when both Macs changed the same part, such as one paragraph or two lines right next to each other, since the last Sync ([git-merge](https://git-scm.com/docs/git-merge)). A paragraph you type without pressing Return is one line, so two edits to different sentences of one paragraph still clash, while edits to different paragraphs combine. Flywrite then opens "Sync conflicts — both you and the remote changed the same content", with the whole file as "Your version (this Mac)" beside "Remote version", never conflict markers.

   ```text
   Paragraphs 1 and 3 → combined
   Paragraphs 1 and 2 → combined
   Same paragraph → conflict
   List items 1 and 2 → conflict
   Delete vs edit → conflict
   ```

   You should see the conflict screen, listing each file both Macs changed in the same place.

6. **Choose a version for each file, then continue.** Click **Keep mine**, **Keep remote** or **Edit merged**; Edit merged puts your version and then the remote's in one box, so delete what you don't want and click **Save merged version**. When every file shows "✓ resolved", click **Continue sync** to finish the pull and push your work, and settle any files a second round shows the same way. **Abort sync** instead puts everything back to this Mac's version, and the conflict returns at your next Sync; until you finish, checkpoints wait, and **Resolve conflicts…** in the branch menu reopens the screen.

   ```text
   Keep mine
   Keep remote
   Edit merged
   Resolve 1 more file to continue
   Continue sync
   ```

   You should see a notification that starts "Synced ·", and the work from both Macs in the file.

7. **Keep conflicts rare.** Sync each time you switch Macs, and finish a paragraph on one Mac before you change it on the other. Edits to different paragraphs combine on their own (step 5).

   ```text
   Leave a Mac: ⌘⇧S
   Sit down at the other: ⌘⇧S
   ```

   You should see the top bar read "synced" on both Macs.

## Facts at a glance

| Fact | Detail |
| --- | --- |
| What Sync does | Saves a checkpoint, pulls new work and pushes yours, in one action (`⌘⇧S`), only when you press it |
| What happens on its own | Flywrite checks GitHub on open, when you switch back and every few minutes, and tells you about new work; your files don't change |
| The second Mac | **Clone from GitHub**, using that Mac's own Git and GitHub login |
| When edits conflict | Only when both Macs changed the same part of a file, such as one paragraph, since the last Sync |
| Conflict choices | **Keep mine**, **Keep remote** or **Edit merged**, file by file; **Abort sync** keeps this Mac's version |
| Where the files live | In your own GitHub repository; Flywrite hosts no sync storage |
| Devices | Up to 3 per seat |
| Price | $99 a year, with GitHub sync included and no AI fee |

## When not to use this

- **You want files to update with no button.** iCloud Drive keeps documents available on every device signed in to the same Apple Account ([Apple's guide](https://support.apple.com/guide/mac-help/use-icloud-drive-to-store-documents-mchle5a61431/mac)). Use it for that folder instead of GitHub sync, not alongside it.
- **One of the computers isn't a Mac.** Flywrite is a Mac app. Obsidian runs on Windows, Mac, Linux, iOS and Android ([Obsidian's downloads](https://obsidian.md/download)), and Typora on Mac, Windows and Linux ([Typora](https://store.typora.io/)).
- **You write on more than 3 Macs.** A seat activates Flywrite on up to 3 devices. Deactivate one you no longer use from your License page; each device can be deactivated once per 30 days ([Licenses & devices](/docs/licenses-and-devices)).
- **You can't sign a Mac's Git in to GitHub.** Checkpoints still keep versions you can restore on each Mac ([Checkpoints & versions](/docs/checkpoints-and-versions)). For a copy off the Mac, see the Time Machine route in [Back up Markdown projects to GitHub](/guides/back-up-markdown-to-github#when-not-to-use-this).

## Sources

1. [Flywrite docs: GitHub backup & sync](/docs/github-backup-and-sync), checked 2026-11-17
2. [Flywrite docs: Your first project](/docs/your-first-project), checked 2026-11-17
3. [Flywrite docs: Licenses & devices](/docs/licenses-and-devices), checked 2026-11-17
4. [Flywrite docs: Keyboard shortcuts](/docs/keyboard-shortcuts), checked 2026-11-17
5. [Flywrite docs: Checkpoints & versions](/docs/checkpoints-and-versions), checked 2026-11-17
6. [Flywrite pricing](/pricing), checked 2026-11-04
7. [GitHub Docs: About remote repositories](https://docs.github.com/en/get-started/git-basics/about-remote-repositories), checked 2026-11-17
8. [GitHub Docs: Caching your GitHub credentials in Git](https://docs.github.com/en/get-started/git-basics/caching-your-github-credentials-in-git), checked 2026-11-17
9. [Pro Git: Installing Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git), checked 2026-11-17
10. [Git documentation: git-merge](https://git-scm.com/docs/git-merge), checked 2026-11-17
11. [Apple Support: Store files in iCloud Drive on Mac](https://support.apple.com/guide/mac-help/use-icloud-drive-to-store-documents-mchle5a61431/mac), checked 2026-11-17
12. [Obsidian download](https://obsidian.md/download), checked 2026-11-17
13. [Typora store](https://store.typora.io/), checked 2026-11-09

---

This is the Markdown copy of https://flywrite.app/guides/sync-writing-between-two-macs.
