[git] fatal: Exiting because of an unresolved conflict.

https://www.jianshu.com/p/ec31319f552e