- changed status to resolved
Ignore *.orig files that get created after git merge
Issue #792
resolved
When you do a merge in git, it creates a bunch of .orig files containing the contents of the file before the merge. If you then switch to Illuminated Cloud, it always tries to add those files for you. When there are other new files that were added in the merge, it's easy to accidentally let the .orig files in.
Comments (1)
-
repo owner - Log in to comment
Issue tracker grooming. If this is still an issue, please feel free to reopen, ideally with a concrete reproduction scenario.