merges with conflicts are not support yet

[misaya98]

Expected Behavior

pull the latest repo

Actual Behavior

error merges with conflicts are not support yet

Reproduction Steps

i didn't do any changes in my local collection, and when i pull it, it says merges with conflicts are not support yet??!! !

by the way, we use the git sync not insomnia sync.

so can i just force pull it ? or give a resolve conflicts window that i can see what conflict is ?

Is there an existing issue for this?

• [X] I have searched the issue tracker for this problem.

Additional Information

by the way, we use the git sync not insomnia sync.

so can i just force pull it ? or give a resolve conflicts window that i can see what conflict is ?

Insomnia Version

9.3.2

What operating system are you using?

Windows

Operating System Version

windows 11 23H2

Installation method

insomnia.rest

Last Known Working Insomnia version

9.3.2