Git: Cannot merge liprjf
Posted: 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:
Thanks,
Crash
when trying to push my Lingo commits to the remote repository, I get the following error message:
Can anybody help?warning: Cannot merge binary files: Lingo/NameOfSoftwareProduct Translations.liprjf/NameOfSoftwareProduct Translations.liprjdb3 (HEAD vs. 37b4898jd482c81360425c9hz386bd2db007029)
Thanks,
Crash