How to commit correctly in PHP Storm?

Question

git

When I pull, the Update Type window appears and the options are: Rebase, Merge and Branch Default and next to Clean working tree before update: Using stash and Using Shelve.
What does it all mean, I leave the default for now.

Answer 1

Regarding the question - you have changes in the files, pull is done in a clean branch.
But I highly recommend using git in the console. There you can do everything faster and more efficiently.
Without it, you can't get along with git - Pro Git
Yes, it will be difficult to understand all this, you will periodically have questions "what the hell?" and "how the hell does it work?", but later you will admire git :)
However, it's hard to argue with this, PhpStorm has very good support for git and many things can be done with buttons. But git and console are made for each other :)