Got to the directory where the repository is located using Git Bash: cd /path/to/repository Run git r...

It would be very helpful if we can use Git Bash inside PhpStorm itself. The fact is, though, that it's a terminal client and that'...

Execute the command below: rm -f ./.git/index.lock If you have no other git processes running (which is the normal case), go ahead...

This will start ignoring the changes to the file: git update-index --assume-unchanged path/to/file  When you want to start keeping track...