Now I resolve several conflicts and want to keep only the remote state.
If I try to change my option: git merge --strategy-option theirs
I have an error: "merge" is impossible because you have unrelated files.
Of course, I can undo my changes (to use the command above), but then I will lose my changes.
Now I suggest running vimdiff: {local}: the modified file {remote}: the modified file Click "Return" to start the merge permission tool (vimdiff):
How can I save only the remote state. If the file does not exist, simply (suggest pressing a button).
Thanks.
user3709509
source share