[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Re: svn update = libknetworkmanager.po conflict
From:       Burkhard =?iso-8859-15?q?L=FCck?= <lueck () hube-lueck ! de>
Date:       2012-01-18 19:25:00
Message-ID: 201201182025.01071.lueck () hube-lueck ! de
[Download RAW message or body]

Am Mittwoch, 18. Januar 2012, 19:55:47 schrieb Abdalrahim Fakhouri:
> Hi all !!
> 
> I have tried to do a 'svn update' before committing 3 files, one of which
> is extragear-base/libknetworkmanager.po
> but I get this error:
> 
> Conflict discovered in 'extragear-base/libknetworkmanager.po'.
> Select: (p) postpone, (df) diff-full, (e) edit,
>         (mc) mine-conflict, (tc) theirs-conflict,
>         (s) show all options: p
> 
> I pressed 'p' as you can see.
> What's next? and how can I fix this problem?!
> This commit is so important:
> 
> $ pocount --short *.po
> desktop_extragear-base_networkmanagement.po strings: total: 53    | 53t
> 0f    0u    | 100%t    0%f    0%u
> libknetworkmanager.po                       strings: total: 897    |
> 721t    68f    108u    | 80%t    7%f    12%u
> plasma_applet_networkmanagement.po          strings: total: 89    | 89t
> 0f    0u    | 100%t    0%f    0%u
> 
> How can I fix this problem ??

http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-conflicts.html

-- 
Burkhard Lück
[prev in list] [next in list] [prev in thread] [next in thread]