Re: merge problem

On Thu, Jul 23, 2009 at 03:00:20PM -0600, Brian Rieck wrote:
> Forgive me if this has been covered. I wasn't able to find this exact
> scenario through searching the archives.
>
> One of our users did the following in a branch she created:
>
> 1) She moved a directory from one place to another, and committed that.
>
> 2) Then she realized that she still needed a directory in the old
> location with the same name but with different files so she added the
>
>
> Now when we merge trunk to her branch all is fine until we try to commit

One piece of information that's missing:
What changes were made on trunk since she branched?

Also, can you try to produce a minimal sequence of Subversion commands
that creates your problem, starting with an empty repository?

Thanks,
Stefan
Received on 2009-07-24 00:07:07 CEST