When Git cannot automatically resolve conflicts it writes a file with conflict markers surrounding the conflicting areas. These conflicts must be resolved manually. This is often done via a three-way ...
Error detected while processing /home/users/huangzhen03/.vimrc: line 89: E117: Unknown function: fnameescape E15: Invalid expression: 'source ' . fnameescape(vimrc ...