Hi Everyone,
I am having some issues understanding tree conflicts.
I attempted the following;
svn merge -r1:head trunk/com/palcare/listsServices/
branches/production/com/palcare/listsServices/ --accept="theirs-full"
and got this;
Skipped 'branches/production/com/palcare/listsServices/ListsServi
On Wed, Apr 20, 2011 at 03:43:06PM +1000, Gavin "Beau" Baumanis wrote:
> Hi Everyone,
>
> I am having some issues understanding tree conflicts.
>
> I attempted the following;
> svn merge -r1:head trunk/com/palcare/listsServices/
> branches/production/com/palcare/listsServices/ --accept="theirs-f
Hi Stefan,
That is awesome thinks
I have had a quick scan, but it is getting let here and I have been up since
very early.
So I'll wait until tomorrow until trying to digest it all, properly.
I'll post back with what I have tried and what did / didn't work.
I really appreciate the assistanc
Hi Stefan,
I have finally managed t get some tie to devote to my lack of understanding of
merge conflicts.
I have read the post you mentioned in your reply;
> http://svn.haxx.se/users/archive-2011-04/0209.shtml
And I have also gone back and re-read the svn-book, too.
I can't say that it has help
On Thu, Jul 14, 2011 at 01:15:29AM +1000, Gavin "Beau" Baumanis wrote:
> and so now I get this when I try to do a merge
> I understand why I have a conflict
> I have an external that is a duplicate of a "real" location and there was an
> edit at the external path too.
>
> so now I get;
>
Hi Stefan,
Here is the information you requested;
svn status shared;
C shared
> local delete, incoming edit upon merge
svn info shared;
Tree conflict: local delete, incoming edit upon merge
Source left: (dir) http://192.168.10.95/svn/repo/trunk/nz/shared@2
Source right: (dir) http:
On Thu, Jul 14, 2011 at 01:43:11AM +1000, Gavin "Beau" Baumanis wrote:
> Hi Stefan,
>
> Here is the information you requested;
>
> svn status shared;
> C shared
> > local delete, incoming edit upon merge
>
>
> svn info shared;
> Tree conflict: local delete, incoming edit upon merge
>
Hi again Stefan - and thanks for the help.
On 14/07/2011, at 2:04 AM, Stefan Sperling wrote:
> On Thu, Jul 14, 2011 at 01:43:11AM +1000, Gavin "Beau" Baumanis wrote:
>> Hi Stefan,
>>
>> Here is the information you requested;
>>
>> svn status shared;
>> C shared
>>> local delete, incoming edit