Page 1 of 1

Git: Cannot merge liprjf

Posted: Wed Mar 13, 2019 3:09 am
by IUseItAsACrash
Hi folks,

when trying to push my Lingo commits to the remote repository, I get the following error message:
warning: Cannot merge binary files: Lingo/NameOfSoftwareProduct Translations.liprjf/NameOfSoftwareProduct Translations.liprjdb3 (HEAD vs. 37b4898jd482c81360425c9hz386bd2db007029)
Can anybody help?

Thanks,
Crash

Re: Git: Cannot merge liprjf

Posted: Mon Mar 25, 2019 1:46 am
by oleksandr_kokoshyn
Hi Crash,

The .liprjdb3 file is the database file that Lingo uses to store various relations between topics. I recommend to exclude it from Git since it's an internal Lingo file. If you close Lingo, delete this file, and start Lingo again, Lingo will recreate it.
Add something like this to your .gitignore file:
/YOUR_PROJECT_DIR/YOUR_PROJECT_NAME.liprjdb3