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

[Subclipse-users] no conflicts

From: <webpost_at_tigris.org>
Date: Mon, 30 Mar 2009 08:23:27 -0700 (PDT)

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?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-30 17:24:24 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.