What does the symbol mean! in WebStorm git integration

I found the character !

between HEAD and REMOTE BRANCH shown below. What does it mean?

symbol!  between HEAD and REMOTE BRANCH

+3


source to share


1 answer


You are in the middle of a merge or redirect that cannot be completed as they encountered a conflict. The exclamation point tells you there is a conflict. Go to the Local Changes tab, right-click on the red file and select Resolve Conflicts. Resolve the conflict (for example, accept your version or a different version, or manually resolve conflicts by editing the code) before proceeding.



+3


source







All Articles