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

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

VS Code Version: Version: 1.70.0 Commit: da76f93349a72022ca4670c1b84860304616aaa2 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:

git stash
git pull
git stash pop
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!!!

About this issue

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

why? I want to accept both cases and then edit them both in bottom (result) pane.

You can set the checkboxes on both sides.

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

Or change the git.mergeEditor setting.

You can set the checkboxes on both sides.

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