Git: Cannot merge liprjf

This Forum is for general issues about MadCap Lingo

Git: Cannot merge liprjf

Postby IUseItAsACrash on Wed Mar 13, 2019 3:09 am

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?

Jr. Propeller Head
Posts: 9
Joined: Wed Jan 30, 2019 2:37 am

Return to MadCap Lingo General Discussion

Who is online

Users browsing this forum: No registered users and 1 guest