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

Merge editor: should the sides flip? #150853

Closed
bpasero opened this issue May 31, 2022 · 2 comments
Closed

Merge editor: should the sides flip? #150853

bpasero opened this issue May 31, 2022 · 2 comments
Assignees
@hediet
Labels
insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue
Milestone
June 2022

Comments

@bpasero
Copy link
Member

bpasero commented May 31, 2022

Testing #150389

When looking at the merge editor of VS compared to VSCode I noticed how the sides are flipped:

image

image

And that made me wonder if we should align, maybe for muscle memory but also since I am currently on branch main and usually the thing on the right is the changes I did.

Was there a UX decision around this or just random?
@isidorn
Copy link
Contributor

isidorn commented May 31, 2022 •
edited

I had similar feedback.
" "Yours" and "Theirs" title seem to be mixed. On the right it says "Theirs", but those are actually the changes I did locally. Intuitvily for me this should be "Yours""

@hediet
Copy link
Member

hediet commented Jun 1, 2022

That was just random. Let's flip it.

@hediet hediet added this to the June 2022 milestone Jun 1, 2022
@hediet hediet added polish Cleanup and polish issue merge-editor labels Jun 1, 2022
@jrieken jrieken removed their assignment Jun 21, 2022
@hediet hediet assigned jrieken and hediet and unassigned hediet and jrieken Jun 21, 2022
hediet added a commit that referenced this issue Jun 21, 2022
@hediet
Sets titles to yours and theirs in the git extension & swaps order. F…
369d31e 
…ixes #150853
@hediet hediet closed this as completed in 467eef9 Jun 21, 2022
@VSCodeTriageBot VSCodeTriageBot 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 Jun 21, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Aug 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@hediet hediet

Labels
insiders-released Patch has been released in VS Code Insiders merge-editor polish Cleanup and polish issue
Projects
None yet
Milestone
June 2022
Development

No branches or pull requests
5 participants
@bpasero @jrieken @isidorn @hediet @VSCodeTriageBot