What does the symbol ! mean in WebStorm's git integration
Zhichao
I found a symbol ! between HEAD and REMOTE BRANCH shown as below link. What does it mean?
axiac
You are in the middle of a merge or rebase that could not be completed because it encountered a conflict. The exclamation mark tells you there is a conflict. Go to the "Local Changes" tab, right click on the red file and pick "Resolve Conflicts". Resolve the conflict (i.e. either accept your version or the other version or manually solve the conflicts by editing the code) before you can continue.
Collected from the Internet
Please contact [email protected] to delete if infringement.
edited at
- Prev: scroll until the element is in view using Selenium2Library Keyword
- Next: mysql group query by name and order by id and limit by id
Related
TOP Ranking
- 1
pump.io port in URL
- 2
Failed to listen on localhost:8000 (reason: Cannot assign requested address)
- 3
How to import an asset in swift using Bundle.main.path() in a react-native native module
- 4
Inner Loop design for webscrapping
- 5
Can't pre-populate phone number and message body in SMS link on iPhones when SMS app is not running in the background
- 6
ggplotly no applicable method for 'plotly_build' applied to an object of class "NULL" if statements
- 7
mysql.connector.errors.InterfaceError: 2003: Can't connect to MySQL server on '127.0.0.1:3306' (111 Connection refused)
- 8
Removed zsh, but forgot to change shell back to bash, and now Ubuntu crashes (wsl)
- 9
Ambiguous use of 'init' with CFStringTransform and Swift 3
- 10
Resetting Value of <input type="time"> in Firefox
- 11
Execute ./script.sh with a crontab
- 12
Converting a class method to a property with a backing field
- 13
Spring Boot JPA PostgreSQL Web App - Internal Authentication Error
- 14
How to update azerothcore-wotlk docker container
- 15
How to set tab order for array of cluster,where cluster elements have different data types in LabVIEW?
- 16
Grails with Oracle thick OCI driver authenticate to Oracle with wrong user
- 17
How to pass data to the ng2-bs3-modal?
- 18
Making Array From Page Elements in jQuery
- 19
Retrieve Element Tag Value XML Using Bash
- 20
Laravel's ORM sync with timestamps doesn't update timestamps
- 21
Do animations stop css changes after animation completion?
Comments