merge editor doesn't handle files without conflict well

[LordXerus]

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

• VS Code Version: 1.99.2
• OS Version: Windows 10

Steps to Reproduce:

1. Stash some changes on an objected oriented file with a class
2. Rename file with class inside. Make some unrelated changes.
3. Commit more stuff
4. Rebase to split commit in step 2
5. Re-commit that as 2 commits
6. Complete rebase
7. Pop stash

[vs-code-engineering]

Thanks for creating this issue! It looks like you may be using an old version of VS Code, the latest stable release is 1.99.3. Please try upgrading to the latest version and checking whether this issue remains.

Happy Coding!

[LordXerus]

Actually, the git integration as a whole might be a bit lacking when dealing with renames. Perhaps, it also might have something to do with me forgetting to save the file as I don't have auto save.