Re: [Gretl-devel] Help about git
Try
https://help.github.com/articles/resolving-a-merge-conflict-using-the-com...
Or if you have a back-up of your local copy of po/zh_CN.po you could
1. make sure the back-up is somewhere safe, outside of the git po
directory
2. rm po/zh_CN.po && git checkout po/zh_CN.po
3. git pull
4. Copy your back-up to po/zh_CN.po
5. git commit
The "git checkout" will overwite your local copy with that from the
repository, which should enable "git pull". Once you're properly
synced you can then update the po file and commit your changes.
Allin
On Wed, 14 Mar 2018, yinung at Gmail wrote:
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.
From ssh://git.code.sf.net/p/gretl/git
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.