Re: [Subclipse-users] no conflicts

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.

http://desktop-eclipse.open.collab.net/

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1482980
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].