简体   繁体   中英

PhpStorm corrupting git with [conflicted]

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?

Turns out the backup software was causing this!

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM