3-way merge is Insomnia’s built-in conflict-resolution experience for Git sync. When your local work and the remote branch both change the same content, Insomnia opens a merge view so you can choose which changes to keep without leaving the app.
Insomnia 3-way merge
Uses:
Insomnia
Related Documentation
Minimum Version
Insomnia - 12.0
Related Resources
3-way merge in Git sync
- Git sync stores your Insomnia project in your third-party Git repository so you can use standard Git workflows, for example GitHub, GitLab, or Bitbucket. Your project data lives in your Git provider’s repository, not Insomnia Cloud.
- 3-way merge is the conflict-resolution UI that appears during Git sync when conflicting edits are detected. You select which changes to keep, and you can perform and combine incoming and local manual edits where supported to stay in full control of the result.
How it works
Insomnia opens the merge view only when both of the following are true:
- Your local changes and the remote branch modify the same content.
- You perform a Pull or Push sync action.
After committing your local changes, Insomnia syncs them with the remote repository when you push or pull. If no conflicts exist between your local and remote branches, the sync completes automatically.
When differences require reconciliation, Insomnia performs a three-way comparison between the local, remote, and base versions.
The merge view opens only when manual input is needed to resolve those conflicts.
When the merge view appears:
- From the Insomnia application, in the version control panel, click Pull.
- If conflicts exist, Insomnia opens the merge view.
- For each conflict, choose which changes to keep.
- Click Commit to save your resolution.
- Click Push to sync your changes.
FAQs
Why don’t I always see the merge view?
After you Commit, when you Pull or Push, Insomnia checks for conflicting changes between your local work and the remote branch.
If conflicts exist, Insomnia opens the 3-way merge so you can review and reconcile them.
If there are no conflicts, sync completes without opening the merge view. For more information, see Version control.
Does Git sync split each request into a separate file?
No. Insomnia provides conflict resolution within your project when you sync with Git; you still commit and push with standard Git actions from Insomnia.
Does Insomnia respect my repository’s branch protections when using Git sync?
Yes. Insomnia respects your Git provider’s branch protections. You can’t push to a protected branch from Insomnia.
Can I create a Git-sync project now and connect the repository later?
Yes. You can create a Git-sync project and add the repository later (supported in recent versions). See Storage options → Git sync.
Does 3-way merge work for collections and design documents?
Yes. 3-way merge applies to the same project resources that Git sync manages—collections, design documents, tests, and environments—so you can resolve conflicts on the content you version in Git. See the Insomnia docs index and storage overview.