Hi,
Shaun McCance <[EMAIL PROTECTED]> writes:
> If this happens, you need to resolve the conflicts manually.
> This can be a real pain in the ass sometimes.
If there are conflicts in a po file and you happen to have your edited
version before cvs merged in the changes done in the repository, don
On Fri, 2005-04-29 at 11:29 -0400, Adam Weinberger wrote:
> Clytie Siddall wrote:
> > Hi everyone :)
> >
> > I started asking the cvs people, but it seems to be something I'm doing
> > wrong. I wish I could work out what. :(
[snip]
> > Please tell me if I'm doing the right thing: I am followi
Hi Duarte, thankyou for your reply. :)
On 30/04/2005, at 6:20 PM, Duarte Loreto wrote:
I'm not sure about this, but shouldn't "cvs -z3 up" merge the local
vi.po with the cvs one and if incapable of merging just create the
dreaded .#vi.po containing the updated one and place the cvs one as
vi.po?
Hello!
I'm not sure about this, but shouldn't "cvs -z3 up" merge the local vi.po
with the cvs one and if incapable of merging just create the dreaded .#vi.po
containing the updated one and place the cvs one as vi.po?
Can't it be that Clytie is using an old version of intltool-update? I once
had
