New rebase conflicts resolution completely broken. Diff worse than before.

[alexisfrjp]

trafficstars

Version: 1.70.0 Commit: da76f93349a72022ca4670c1b84860304616aaa2 Date: 2022-08-04T04:38:48.541Z Electron: 18.3.5 Chromium: 100.0.4896.160 Node.js: 16.13.2 V8: 10.0.139.17-electron.0 OS: Linux x64 4.18.0-408.el8.x86_64

I rebase a branch with a single word different, I get everything as a conflict and can't see where is the difference is.

The diff engine is seriously damaged...

3-way merge

only user_rst vs usr_rst

2-way merge

vs

I should see only the line with the user_rst shown as a conflict, not the tens of lines I currently have.

VSCode should also try to be coherent on naming, 3-way doesn't exist even though it's named like that 3-way merge in the release note and everywhere else.

Even disabling the Merge Editor still opens a window with the conflicts...

[Ryanv030]

Yep completely broken for me too!

[Ryanv030]

@alexisfrjp I just reverted to 1.69.0 and all is working fine again!

[hediet]

Even disabling the Merge Editor still opens a window with the conflicts...

Unfortunately you need to reload/restart VS Code after toggling that setting.

Can you share details of your merge conflict?

[hediet]

/duplicate #156608

[vscodenpa]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.

Happy Coding!