12+ How To Resolve Conflicts In Git New. After you’ve finished with external conflict resolution, you can select themark resolved option. Git attempts to resolve these changes by using the history in your repo to determine what the merged files should look like. Git 常用命令以及相关资料 呆呆's blog from tonyrenhk.github.io Click merge in the conflicts dialog, …