it is also very powerful. Very easy to shoot yourself in
the foot.
John
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Wednesday, September 19, 2012 4:34 AM
To: David Aldrich
Cc: users@subversion.apache.org
Subject: Re: Merging headache
On Wed, Sep 19, 2012 at 08:19:59
On Wed, Sep 19, 2012 at 08:19:59AM +, David Aldrich wrote:
> As this is rather a mess, can you suggest a way to get back to some degree of
> order?
I'm afraid I cannot make any reasonable suggestion at this point, sorry.
I'd need more information about what really happened.
Hi Stefan
Thanks very much for your advice, I will take careful note of it.
> BTW, I'm curious why you're getting an svn:mergeinfo conflict.
> That should never happen if you follow best practices.
> Is this common in your environment? If so, it seems people must be doing
> something quite wrong,
On Wed, Sep 19, 2012 at 07:15:40AM +, David Aldrich wrote:
> Hi
>
> I am trying to update a branch with changes from the trunk. I am getting tree
> conflicts that I do not know how to resolve. Please will someone take a look
> at my console output below and advise me what to do? (For the sak
