Re: Merging feature branch into trunk transmits unchanged files

Rick Yorgason wrote:
> The problem still exists with the correct revision numbers, though. The
> problem seems to be that when we merge the trunk into the branch,
> sometimes the files end up marked as modified instead of merged, and I'm
> not sure why. Here's an example:

Edit: I mean marked modified instead of replaced, not merged.

-Rick-

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 15 03:31:08 2007