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

Better diff for deleted file merge conflict #88973

Closed
cpa-level-it opened this issue Jan 20, 2020 · 2 comments · Fixed by #91245
Closed

Better diff for deleted file merge conflict #88973

cpa-level-it opened this issue Jan 20, 2020 · 2 comments · Fixed by #91245
Assignees
@joaomoreno
Labels
feature-request Request for new features or functionality git GIT issues help wanted Issues identified as good community contribution opportunities on-release-notes Issue/pull request mentioned in release notes verification-needed Verification of issue is requested verified Verification succeeded
Milestone
November 2020

Comments

@cpa-level-it
Copy link

If there is a conflict with a deleted file during a merge, vscode won't display a diff for that file. Instead the last version of the file before being deleted is shown as readonly.

With this it's hard to see the changes that were made on the file before (or after) it was deleted.

With git you can see those changes using a commande like

git diff ...incoming_merge_branch -- rel_path_deleted_file
or
git diff incoming_merge_branch... -- rel_path_deleted_file

Depending if the conflict is a "deleted by us" or "deleted by them".

Would it be possible for vscode to use this command when a displaying a conflict for a deleted file ?
It would greatly help the merge process I think.

For the time being I configured vscode to be my difftool so I can write this command and display the diff in vscode.

git difftool ...incoming_merge_branch -- rel_path_deleted_file

But still, if I could not have to write the commande it'll be easier.
@vscodebot vscodebot bot added the git GIT issues label Jan 20, 2020
@joaomoreno joaomoreno added the feature-request Request for new features or functionality label Jan 21, 2020
@joaomoreno joaomoreno added this to the Backlog milestone Jan 21, 2020
@joaomoreno joaomoreno added the help wanted Issues identified as good community contribution opportunities label Jan 21, 2020
jeanp413 added a commit to jeanp413/vscode that referenced this issue Feb 23, 2020
@jeanp413
Better diff for deleted file in merge conflict. Fixes microsoft#88973
dc50a3b
@jeanp413 jeanp413 mentioned this issue Feb 23, 2020
Merged
joaomoreno added a commit that referenced this issue Nov 5, 2020
@jeanp413 @joaomoreno
Better diff for deleted file in merge conflict. Fixes #88973 (#91245)
818d57d 
Co-authored-by: João Moreno <joao.moreno@microsoft.com>
@joaomoreno joaomoreno modified the milestones: Backlog, November 2020 Nov 5, 2020
@joaomoreno joaomoreno added author-verification-requested Issues potentially verifiable by issue author verification-needed Verification of issue is requested and removed unreleased Patch has not yet been released in VS Code Insiders labels Nov 5, 2020
@cpa-level-it
Copy link
Author

/verified

@joaomoreno joaomoreno added the verified Verification succeeded label Nov 27, 2020
@joaomoreno joaomoreno added the on-release-notes Issue/pull request mentioned in release notes label Dec 7, 2020
@github-actions github-actions bot locked and limited conversation to collaborators Dec 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@joaomoreno joaomoreno

Labels
feature-request Request for new features or functionality git GIT issues help wanted Issues identified as good community contribution opportunities on-release-notes Issue/pull request mentioned in release notes verification-needed Verification of issue is requested verified Verification succeeded
Projects
None yet
Milestone
November 2020
Development

Successfully merging a pull request may close this issue.

Better diff for deleted file in merge conflict jeanp413/vscode
3 participants
@joaomoreno @cpa-level-it and others