[Gretl-devel] Help about git

Hi, I would like to update the translation PO files but I failed. I got the following message in terminal. How should I do? Thanks. yinung yinung@mint18 ~/git/gretl-git $ git pull Password: remote: Counting objects: 7, done. remote: Compressing objects: 100% (4/4), done. remote: Total 4 (delta 3), reused 0 (delta 0) Unpacking objects: 100% (4/4), done. 2abb460..ae3f7c3 master -> origin/master Auto-merging po/zh_CN.po CONFLICT (content): Merge conflict in po/zh_CN.po Automatic merge failed; fix conflicts and then commit the result.