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

RE: Re: [Subclipse-users] no conflicts

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

One file had the text:

The other one had:
//testing change
//with extra row

Both were committed, and if I compare them I can see that the correct content is compared.
The files are marked as updated both in the console and in eclipse GUI. I like subclipse, but cant understand this.

I've tried with subclipse 1.4.7 and 1.4.8

> 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/


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