[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: More strange merge conflicts.

From: Steve Greenland <steveg_at_lsli.com>
Date: 2005-08-01 20:36:29 CEST

On Mon, Aug 01, 2005 at 12:43:56PM -0400, Martin J. Stumpf wrote:
> If what Scott says is true, which I believe it is, then why would Ben
> suggest the use of 100 to remove the errors? ie. overlapping the
> previous last rev with the current first rev. I have always skipped the
> commit rev on the branch just like David suggests. It seems so logical
> somehow. I am confused a bit now.

He's not overlapping. Rev r100 is the merge commit rev, the OP was
starting the new merge with r101. But r101 had to come from *somewhere*,
and the OP is dropping that change.


"Outlook not so good." That magic 8-ball knows everything! I'll ask
about Exchange Server next.
                           -- (Stolen from the net)
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 1 20:39:12 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.