Fix indentations
errors: Introduce EMERGECONFLICT error code
checkout: Deploy EMERGECONFLICT usage
Fix MSVC compilation warnings
Fix MSVC Clar compilation warnings
Merge pull request #1227 from nulltoken/topic/emergeconflict

Introduce EMERGECONFLICT