What does the prompt "[master +1 ~0 -0 !]>" mean when using Git command line?

Question

After a few Git commands, I find my command line prompt change from

[master]>

to

[master +1 ~0 -0 !]>

What does this mean?

Answer 1

This represents the number of files:

• added (+)
• modified (~)
• deleted (-)
• conflict (!) (from alisa's answer)

You can see a powershell version of that prompt here.

Those represent the status before commit (added means added to the index, or 'staged')

Here is a more complete version of that prompt, which also display the number of commits ahead or behind an upstream repository.

When you do some changes and commit them, your state is 1 commit ahead of remote. It is very useful to know how many commits you have unpushed.

Answer 2

And:

• Conflicts ( ! )

Usually there is no conflict, but sometimes it occurs (for example when a file is changed in both your local repository and the online repository, and you want to pull. So Git doesn't know which one to keep).

In these cases, you have to correct and save the conflicting file (that is already marked by Github, showing the conflicting lines) manually.