Why the merge tool is so ugly? Looks like somebody got brainfart implementing this :D
Ok sorry, but could you do this in better way?
Like it is done "Sublime merge", "JetBrains"
It's almost done by clicking on "Compare Changes" but it's read only. So lets do it this way - make left side (local copy) editable so the user just could copy some stuf from incoming changes
IllusionMH
commented
3 years ago
Why the merge tool is so ugly? Looks like somebody got brainfart implementing this :D Ok sorry, but could you do this in better way? Like it is done "Sublime merge", "JetBrains"
It's almost done by clicking on "Compare Changes" but it's read only. So lets do it this way - make left side (local copy) editable so the user just could copy some stuf from incoming changes
Originally posted by @FDiskas in https://github.com/microsoft/vscode/pull/47884#issuecomment-726805988