Enhance auto-deploy command to show detailed output if there is git conflict.