You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I don't think this is an issue with the plugin. You just create a merge conflict, which the plugin can't solve more than git. You can set rebase to be used when pulling in the settings.
I'd just like to have configuration in which I can save changes from both machines (as in the above scenario) in one action (per machine) without creating a merge conflict.
I just tried using the "rebase" setting; unfortunately this does not change that I get an error message, however, it seems not to create a merge conflict...
The sequence
edit file example.md on machine A
edit file example.md on machine B (different edit)
Git: Create backup on machine A
git commit on machine B
git pull --rebase on machine B
git push on machine B
works for me without a merge conflict and without an error (given that an automatic merge is possible).
Describe the bug
Merge conflicts when doing
Git: Create backup
in a 2 machine scenarioRelevant errors (if available) from notifications or console (
CTRL+SHIFT+I
)No response
Steps to reproduce
Git: Create backup
on machine AGit: Create backup
on machine Bresults in merge conflict.
Expected Behavior
no merge conflict.
This could be achieved by a git command sequence within
Git: Create backup
:git commit
git pull [--rebase]
git push
Addition context
No response
Operating system
macOS
Installation Method
None
Plugin version
2.24.1
The text was updated successfully, but these errors were encountered: