How to ask git if the repository is in a conflict stage? How to ask git if the repository is in a conflict stage? git git