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

Re: [Subclipse-users] no conflicts

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 30 Mar 2009 11:26:08 -0400

On Mon, Mar 30, 2009 at 11:23 AM, <webpost_at_tigris.org> wrote:
> I can't get any flags for conflicts when merging. I only get updates.
> What could be wrong?
> I change test.php in Trunk and in a Branch, on the same row, with different texts. Commit them both and then merges them.
> Shouldn't that give a conflict?

It is up to Subversion to decide. Did the merged file have both lines
of text? If not, then maybe you did the merge wrong?

You might want to install the CollabNet merge client. It is built on
Subclipse and make the process easier.


Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-30 17:26:42 CEST

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

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