Can't check in due to conflicting changes
- by themaninthesuitcase
I have an issue that means I cannot check in changes even if I resolve the issues.
I have removed a form from the solution then created a new form with the same name. Now when I go to check in the form I get the following error:
Even if I mark all the conflicts as resolved the check in fails with the following error: All conflicts resolved but no files checked in due to initial conflicts.
How can I get this to check in?