What worked for me: - The problematic files were under "Unversioned" changelist (in IntelliJ) - Instead of deleting the files, I created a new change list and moved those files to that one. - Was able to check-out the required branch after this