You have not concluded your merge (MERGE_HEAD exists). Exiting because of unfinished merge.
git fetch --all
git reset --hard origin/dev
You have not concluded your merge (MERGE_HEAD exists). Exiting because of unfinished merge.
git fetch --all
git reset --hard origin/dev
https://github.com/zhangbo2008/Trie_with_informationExtraction_and_fuzzy_matchingv2