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

Can't get merge to work as suggested

From: Tomas Sandkvist <tomas.sandkvist_at_protang.se>
Date: 2003-09-03 14:04:09 CEST


Testing out the merge function to learn how it works. I have created a trunk
and a branch of a simple text file with six lines of text.

When I try to merge the branch into the trunk it is replaced by the contents
of the branch. Any changes I've made to the trunk disapears.

A diff on these two files show all differences as it should.

Feel a bit embaressed not being able to figure this out... As far as I can
see i have done everything by the book, still I can't merge such a simple

Everything runs on my local computer, SVN-0.27 is used.

Tomas Sandkvist

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 3 14:03:31 2003

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.