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.

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

Skip resolving save conflict when the contents between disk and editor are equal #241381

Closed
LordXerus opened this issue Feb 20, 2025 · 1 comment
Assignees
Labels
feature-request Request for new features or functionality file-io File I/O unreleased Patch has not yet been released in VS Code Insiders verification-needed Verification of issue is requested
Milestone

Comments

@LordXerus
Copy link

LordXerus commented Feb 20, 2025

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

  • VS Code Version: 1.97.2
  • OS Version: Windows_NT x64 10.0.19044

Steps to Reproduce:

  1. Create new file
  2. Write contents (In my example I used test)
  3. Save file
  4. Make a change to file (In my example I appended r)
  5. Make the same change externally (To simulate an external tool like git stash pop)
  6. Try to save file in VSCode
  7. Result: VSCode asks to resolve save conflict even when the files are same

Kind of harmless bug, but should be an easy fix.

Image

Image

@bpasero
Copy link
Member

bpasero commented Feb 21, 2025

Related: #919

But this idea is really genius, not sure why I never had thought about 👏

@bpasero bpasero added feature-request Request for new features or functionality file-io File I/O labels Feb 21, 2025
@vs-code-engineering vs-code-engineering bot added this to the Backlog Candidates milestone Feb 21, 2025
@microsoft microsoft deleted a comment from vs-code-engineering bot Feb 21, 2025
@bpasero bpasero added the verification-needed Verification of issue is requested label Feb 21, 2025
@vs-code-engineering vs-code-engineering bot added the unreleased Patch has not yet been released in VS Code Insiders label Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-request Request for new features or functionality file-io File I/O unreleased Patch has not yet been released in VS Code Insiders verification-needed Verification of issue is requested
Projects
None yet
Development

No branches or pull requests

2 participants