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

Three column conflict resolution view #59027

Closed
smbkr opened this issue Sep 20, 2018 · 2 comments
Closed

Three column conflict resolution view #59027

smbkr opened this issue Sep 20, 2018 · 2 comments
Assignees
@joaomoreno
Labels
git GIT issues

Comments

@smbkr
Copy link
Contributor

smbkr commented Sep 20, 2018

A three column git merge conflict resolution view could be really useful. Currently, a single column is used, showing both incoming changes and changes from HEAD, as well as the eventual merged state.

An alternative to this would be to use three columns for the three different states, ie. incoming changes on the left, the state of HEAD on the right, and the output of the merge once changes are picked in the centre column.

Sublime Merge has a similar implementation.
@vscodebot
Copy link

vscodebot bot commented Sep 20, 2018

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

@vscodebot vscodebot bot added the git GIT issues label Sep 20, 2018
@smbkr
Copy link
Contributor Author

smbkr commented Sep 20, 2018

Closing as this is a duplicate of #37350

@smbkr smbkr closed this as completed Sep 20, 2018
@vscodebot vscodebot bot locked and limited conversation to collaborators Nov 4, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@joaomoreno joaomoreno

Labels
git GIT issues
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@joaomoreno @smbkr