Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of Andreas.Tscharner@metromec.ch
 designates 46.140.90.130 as permitted sender)
From: Andreas Tscharner <Andreas.Tscharner@metromec.ch>
To: 'John Maher' <JohnM@rotair.com>, Subversion help
	<users@subversion.apache.org>
Subject: RE: Merge problem
Thread-Topic: Merge problem
Thread-Index: Ac/MXqaZzBnpYaIsRpyepuiQOLjzeQAhpF+w
Date: Wed, 10 Sep 2014 10:56:42 +0000
Message-ID: <EFA3E302AA18CB40AA594755D0C8B6BE70B10ED8@SRV1.metromec.local>
References: <910250F21FAA2A4E8F72DD21EA78076609427A6F@VMJudi.corp.rotair.com>
In-Reply-To: <910250F21FAA2A4E8F72DD21EA78076609427A6F@VMJudi.corp.rotair.com>
Accept-Language: de-CH, en-US
Content-Language: de-DE
Content-Type: text/plain; charset="Windows-1252"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0


[snip]
> Just wondering if anyone may have an idea how my repository=20
> got so buggered up.  I tried to merge a branch to the trunk=20
> and received 49 conflicts.  2 are files that do not need to=20
> be tracked so that leaves 47.  Out of the 47 there are two=20
> problems, local add, incoming add upon merge & local delete,=20
> incoming delete upon merge.  I was doing some code cleanup so=20
> it is possible I deleted the files in two different branches.=20
>  But I know for certain that I did not create the same file=20
> twice.  I did a diff on the first one and it is identical in=20
> both branches, easy to fix, difficult to determine how the=20
> conflict came about.  The second file is different, I deleted=20
> dome code that is not needed anymore.  More work to fix. =20
> With the conflict it causes the merge to fail thus making=20
> this much more time consuming to fix.  The question I have is=20

I don't want to offend anyone here, but such bogus merge conflicts were the=
 reason we changed to git.

> anyone know what I could=92ve done to create these false conflicts?
>=20
Not to my knowledge...

Best regards
WENZEL Metromec AG
	Andreas
--=20
Andreas Tscharner, Development
WENZEL Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone:          +41 (0)81 257 07 00
fax:            +41 (0)81 257 07 01
e-mail:         mailto:andreas.tscharner@metromec.ch=20
www:            http://www.metromec.ch=