Re: Odd merge conflicts

On Jan 10, 2005, at 4:47 PM, Ben Collins-Sussman wrote:

> Scott,
>
> Your algorithmic description of "keeping the branch in sync with the
> trunk" sounds spot-on.

Good.

> AFAIK, adding eol-style properties as part of a merge shouldn't create
> any problems. It's no different than running 'svn propset' by hand on
> your working copy.

Thanks, that was the part I was waiting to hear about... Now that you
have confirmed this I will try to find the time to make an attempt at
reproducing the issue. I'm suspecting that it may have been something
silly to do with reformatting whitespace, but I need to double check.
I should be able to confirm this by stepping back through the revisions
of the branch to before the merge and then attempting the merge again
in a fresh working copy.

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 10 23:11:45 2005