Cannot accept both sides for conflicts that cannot be merged semi-automatically

[ip75]

Does this issue occur when all extensions are disabled?: Yes/No

• VS Code Version:
  Version: 1.70.0
  Commit: da76f93
  Date: 2022-08-04T04:38:16.462Z
  Electron: 18.3.5
  Chromium: 100.0.4896.160
  Node.js: 16.13.2
  V8: 10.0.139.17-electron.0
  OS: Windows_NT x64 10.0.19044

• OS Version: win10

Steps to Reproduce:

1. git stash
2. git pull
3. git stash pop
4. unable to accept both changes come from remote and local changes when merge after git pull. New version vscode let me chose only theirs or mine BUT I NEED ACCEPT BOTH CHANGES!!!!!!!!!!!!!!!!!

[gjsjohnmurray]

You can set the checkboxes on both sides.

[ip75]

You can set the checkboxes on both sides.

NO! If I'd be able to do it I'd not open an issue.

[ip75]

developer have to make decision about what merge and how to merge. NOT IDE! IDE has to help to do merge or replace!

[ip75]

I have to switch to GoLand because of your "smart" merge........

[gjsjohnmurray]

Or change the git.mergeEditor setting.

[gjsjohnmurray]

You can set the checkboxes on both sides.

NO! If I'd be able to do it I'd not open an issue.

Pinging @hediet

[hediet]

Can you share details of your merge conflict?
The merge editor has the command "Copy Merge Editor State As JSON".

[ip75]

I made changes it for test conflict.

[hediet]

In this case, you cannot accept both sides automatically.
In case you do want both lines, you have to copy them manually.