Hmmm. That conflict thing looks bogus, yeah. Would you mind
reporting that as a bug on the dev@subversion.tigris.org list, and
we'll see what the conflict-code experts have to say?
Thanks,
-Karl
Markus Dehmann <markus.dehmann@gmail.com> writes:
> 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:
> http://svnbook.red-bean.com/en/1.0/re16.html
>
> 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?!
>
> Thanks!
> Markus
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 21 06:05:54 2005