Git: Cannot merge liprjf

This Forum is for general issues about MadCap Lingo
Post Reply
IUseItAsACrash
Propeller Head
Posts: 22
Joined: Wed Jan 30, 2019 2:37 am

Git: Cannot merge liprjf

Post 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
oleksandr_kokoshyn
Propeller Head
Posts: 27
Joined: Mon Sep 03, 2018 4:19 am

Re: Git: Cannot merge liprjf

Post 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
Post Reply