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 conflicts: no way to go back from compare changes to diff view #27562

Closed
isidorn opened this issue May 30, 2017 · 5 comments
Closed

Merge conflicts: no way to go back from compare changes to diff view #27562

isidorn opened this issue May 30, 2017 · 5 comments
Assignees
@chrmarti
Labels
feature-request Request for new features or functionality merge-conflict Merge conflict decorations and actions *out-of-scope Posted issue is not in scope of VS Code
Milestone
Backlog

Comments

@isidorn
Copy link
Contributor

isidorn commented May 30, 2017

Refs: #27549

  1. have a merge conflict, click on compare changes
  2. click on the show file action in the title bar -> it has no effect, I would expect that it goes back to the file with all my merge conflicts

noaction
@chrmarti
Copy link
Contributor

The compare view is in a new editor. You can close that editor to go back.

Can we hide that button when there is no file to go back to? @joaomoreno

@chrmarti chrmarti added bug Issue identified by VS Code Team member as probable bug git GIT issues labels Jun 6, 2017
@joaomoreno
Copy link
Member

@chrmarti #21131

@chrmarti chrmarti added this to the Backlog milestone Jun 13, 2017
@chrmarti chrmarti added merge-conflict Merge conflict decorations and actions and removed git GIT issues labels Sep 7, 2017
@chrmarti chrmarti added feature-request Request for new features or functionality and removed bug Issue identified by VS Code Team member as probable bug labels Dec 1, 2017
@arturogh
Copy link

arturogh commented Nov 7, 2018 •
edited
Loading

+1
Today, compare changes opens the compare view in the same tab. I would expect that to open a new tab instead.

@alanyinjs alanyinjs mentioned this issue Jan 8, 2019
Closed
@chrmarti chrmarti added the *out-of-scope Posted issue is not in scope of VS Code label Oct 31, 2019
@vscodebot
Copy link

vscodebot bot commented Oct 31, 2019

We closed this issue because we don't plan to address it in the foreseeable future. You can find more detailed information about our decision-making process here. If you disagree and feel that this issue is crucial: We are happy to listen and to reconsider.

If you wonder what we are up to, please see our roadmap and issue reporting guidelines.

Thanks for your understanding and happy coding!

@vscodebot vscodebot bot closed this as completed Oct 31, 2019
@jordankittle
Copy link

This issue is annoying me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@chrmarti chrmarti

Labels
feature-request Request for new features or functionality merge-conflict Merge conflict decorations and actions *out-of-scope Posted issue is not in scope of VS Code
Projects
None yet
Milestone
Backlog
Development

No branches or pull requests
6 participants
@joaomoreno @isidorn @jordankittle @kieferrm @arturogh @chrmarti