merge报错修复

merge报错修复记录

1、unmerged index entries when writing inmemory index

git merge -s resolve  you_need_merge_branch