Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scroll glitch in resolve conflicts view #236229

Open
deepak1556 opened this issue Jan 23, 2024 · 3 comments
Open

Scroll glitch in resolve conflicts view #236229

deepak1556 opened this issue Jan 23, 2024 · 3 comments
Assignees
Labels
bug Issue identified by VS Code Team member as probable bug merge-editor

Comments

@deepak1556
Copy link
Collaborator

Testing #5648

Screen.Recording.2024-01-23.at.22.22.16.mov
@alexr00 alexr00 assigned hediet and unassigned alexr00 Jan 23, 2024
@deepak1556
Copy link
Collaborator Author

deepak1556 commented Jan 24, 2024

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 electron/electron#28274. Let me know if I can get any useful logs to debug this issue further.

@hediet
Copy link
Member

hediet commented Mar 25, 2024

This looks really bad.

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

@deepak1556
Copy link
Collaborator Author

deepak1556 commented Mar 26, 2024

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 electron/electron@2f89e24 against latest main

@alexr00 alexr00 transferred this issue from microsoft/vscode-pull-request-github Dec 16, 2024
@hediet hediet added bug Issue identified by VS Code Team member as probable bug merge-editor labels Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issue identified by VS Code Team member as probable bug merge-editor
Projects
None yet
Development

No branches or pull requests

3 participants