@pslaughter yes this is the one. Once you're freed up from what you have currently on your hands, this seems prime to be handled by you, do let me know if you don't think it will fit and we should have someone else pick it up, as it is a ~P1.
Unfortunately, this issue will probably slip 11.10.
There's a few IDE regressions that are made pretty apparent while working on generating diffs for the web terminal. I'm going to prioritize these so that it can get in for 11.10.
User creates file, stages it, and then deletes it. The file is stuck in staging / changed (and attempting to discard all changes throws an error).
User deletes file. When user tries to create a file with the same name, it says a file exists with that name already.
Why are these issues relevant?
The changedFiles and stagedFiles properties are used to generate a diff to send to the web terminal. To do this reliably we need to handle some edge cases where the same file is referenced in both changed and staged.
yes, this slipped into 11.11. Moving it there and also consolidating this into the original issue, thus I will be closing this issue and moving its weight to the description of https://gitlab.com/gitlab-org/gitlab-ee/issues/5276