In the Git Version Control multi-file update window, if I have a file with conflicts, and open the
- Diff to edit and resolve the conflicts, "Add" is enabled, but if I click on it before saving, it will not prompt to save the edited file first, and will add the file before it has been saved (so it still has conflict markers in it).