Skip to content

Commit efdb6a5

Browse files
TuannasCodeCatastropheTuannasCodeCatastrophelena-larionova
authored
Feat (Insomnia) Explain maximum number of lines for 3 way merge (#3989)
* 1ST DRAFT needs beta release for nav inclusion * updated FAQ * Update app/insomnia/three-way-merge.md Co-authored-by: lena-larionova <[email protected]> --------- Co-authored-by: TuannasCodeCatastrophe <[email protected]> Co-authored-by: lena-larionova <[email protected]>
1 parent 519eb24 commit efdb6a5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

app/insomnia/three-way-merge.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@ faqs:
3131
- q: Can I create a Git-sync project now and connect the repository later?
3232
a: Yes. You can create a Git-sync project and add the repository later (supported in recent versions). See Storage options → Git sync.
3333
- q: Does 3-way merge work for collections and design documents?
34-
a: 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.
34+
a: 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](/index/insomnia/) and [storage overview](/insomnia/storage/).
35+
- q: Why does Insomnia sometimes fall back to the “choose local or remote file” conflict resolution instead of 3-way merge?
36+
a: |
37+
Insomnia uses 3-way merge to resolve Git conflicts when files are at least 20,000 lines. To protect performance and prevent errors with very large files, Insomnia applies a safety limit.
38+
39+
If a file exceeds 100,000 lines, Insomnia doesn't attempt a 3-way merge. Instead, it reverts to the previous conflict resolution behavior and prompts you to choose between:
40+
- The entire local file
41+
- The entire remote file
3542
---
3643

3744
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.

0 commit comments

Comments
 (0)