PhpStorm corrupting git with [conflicted]

Viewed 31

PhpStorm seems to be littering my codebase by postfixing files with [conflicted], including files like HEAD, index, etc in the .git folder.

This in turn, corrupted my git repo, and I had to manually rename corrupted files in the .git folder.

Is there a setting I can make to prevent PhpStorm from postfixing files?

1 Answers

Turns out the backup software was causing this!

Related