[Lazarus] While starting IDE, lazarus lock, without nay error
Mattias Gaertner
nc-gaertnma at netcologne.de
Sat Aug 15 14:59:50 CEST 2015
On Sat, 15 Aug 2015 15:51:47 +0300
FreeMan <freeman35 at delphiturkiye.com> wrote:
>[...]
> Conflict discovered in
> '/opt/lazarus/components/leakview/languages/heaptrcview.ru.po'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options: df
Choose tc
This can happen with .po files. Sometimes the committers forget to
commit files and commit them with one of the next revisions.
Mattias
More information about the Lazarus
mailing list