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

List:       kde-i18n-doc
Subject:    svn update = libknetworkmanager.po conflict
From:       Abdalrahim Fakhouri <abdilra7eem () gmail ! com>
Date:       2012-01-18 18:55:47
Message-ID: CABS9rGtocSNkqwO6zC2fvhPYshKA9ApSFcP1POJrGH+GeWXMFA () mail ! gmail ! com
[Download RAW message or body]

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 ??
waiting for your reply ...

----------------
A. Fakhouri

[Attachment #3 (text/html)]

<div dir="ltr">Hi all !!<br><br>I have tried to do a &#39;svn update&#39; before \
committing 3 files, one of which is extragear-base/libknetworkmanager.po<br>but I get \
this error:<br><br>Conflict discovered in \
                &#39;extragear-base/libknetworkmanager.po&#39;.<br>
Select: (p) postpone, (df) diff-full, (e) edit,<br>               (mc) mine-conflict, \
(tc) theirs-conflict,<br>               (s) show all options: p<br><br>I pressed \
&#39;p&#39; as you can see.<br>What&#39;s next? and how can I fix this problem?!<br> \
This commit is so important:<br><br>$ pocount --short \
*.po<br>desktop_extragear-base_networkmanagement.po strings: total: 53       | 53t    \
0f       0u       | 100%t       0%f       0%u<br>libknetworkmanager.po                \
strings: total: 897       | 721t       68f       108u       | 80%t       7%f       \
12%u<br> plasma_applet_networkmanagement.po                   strings: total: 89      \
| 89t       0f       0u       | 100%t       0%f       0%u<br><br>How can I fix this \
problem ??<br clear="all">waiting for your reply ...<br><br>----------------<br>A. \
Fakhouri<br>

</div>



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