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

many "conflicts" that are not really conflicts

From: Markus Dehmann <markus.dehmann_at_gmail.com>
Date: 2005-02-21 05:15:40 CET

I created a branch at revision 1685. I modified the branch a lot,
created new files etc. Then, I wanted to merge it back to the trunk.

But, it shows lots of ridiculous pseudo-conflicts, like:

<<<<<<< .working
# $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
# $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
>>>>>>> .merge-right.r1978

What is that? The lines are exactly the same. Why is it showing a
conflict? I can't believe I have to edit all these files by hand now.

BTW, I merged the trunk back to head as described here:

BTW, I didn't find an easy way to find out at which revision my branch
was created. I ended up using this command:
svn log -v file:///path/to/branches | grep my_branch | grep from

But there must be a better way to do this?!


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 21 05:17:55 2005

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.