search

microsoft / vscode-pull-request-github

GitHub Pull Requests for Visual Studio Code
https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github
MIT License
2.31k stars 577 forks source link

Scroll glitch in resolve conflicts view #5654

Open deepak1556 opened 9 months ago

deepak1556 commented 9 months ago

Testing #5648

https://github.com/microsoft/vscode-pull-request-github/assets/964386/1a172e05-8cda-4a9c-bbe8-d972d0cf2872

deepak1556 commented 9 months ago

The issue happens depending on the number of files involved with conflicts, issue didn't repro with single file conflict. I have a reliable repro using the PR at https://github.com/electron/electron/pull/28274. Let me know if I can get any useful logs to debug this issue further.

hediet commented 7 months ago

This looks really bad.

@deepak1556 do you remember which commits you merged (against which base commit) that caused this?

deepak1556 commented 7 months ago

Didn't remember, tried the flow again. Issue happens only when merge editor is opened via Resolve conflicts action in the PR view, manually opening the merge editor on each file does not show the rendering artifacts. Issue can be seen with any of the 7 conflict files from https://github.com/electron/electron/pull/28274/commits/2f89e24fc0d883021278bae39e612860750f452a against latest main