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.

Sign up for GitHub

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

Jump to bottom

Word wrap doesn't affect the text of the base in the merge editor #173969

Closed
xiaoxi-david opened this issue Feb 9, 2023 · 1 comment · Fixed by #174688
Closed

Word wrap doesn't affect the text of the base in the merge editor #173969

xiaoxi-david opened this issue Feb 9, 2023 · 1 comment · Fixed by #174688
Assignees
@hediet @EliiseS
Labels
bug Issue identified by VS Code Team member as probable bug insiders-released Patch has been released in VS Code Insiders merge-editor verified Verification succeeded
Milestone
March 2023

Comments

@xiaoxi-david
Copy link

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

Word wrap doesn't affect the text of the base in the merge editor, regardless of whether the base is displayed in the center or at the top.

Steps to reproduce:

  1. Merge a branch with a conflict
  2. Open the merge editor
  3. Select word wrap

Base in the center
image

Base at the top
image

Version: 1.76.0-insider (system setup)
Commit: 853b32b
Date: 2023-02-09T05:23:28.458Z
OS: Windows_NT x64 10.0.19045
Sandboxed: Yes
@hediet hediet added bug Issue identified by VS Code Team member as probable bug merge-editor labels Feb 10, 2023
@hediet hediet added this to the On Deck milestone Feb 10, 2023
@EliiseS
Copy link
Member

EliiseS commented Feb 17, 2023

I'll pick this up 😄

@hediet hediet modified the milestones: On Deck, February 2023 Feb 17, 2023
@EliiseS EliiseS mentioned this issue Feb 17, 2023
Merged
@hediet hediet modified the milestones: February 2023, March 2023 Feb 20, 2023
@vscodenpa vscodenpa added unreleased Patch has not yet been released in VS Code Insiders insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Feb 24, 2023
@joyceerhl joyceerhl added the verified Verification succeeded label Mar 22, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Apr 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@hediet hediet

@EliiseS EliiseS

Labels
bug Issue identified by VS Code Team member as probable bug insiders-released Patch has been released in VS Code Insiders merge-editor verified Verification succeeded
Projects
None yet
Milestone
March 2023
Development

Successfully merging a pull request may close this issue.

Fix issues with inconsistent line wrap application EliiseS/vscode
5 participants
@hediet @EliiseS @xiaoxi-david @joyceerhl @vscodenpa