On Thu, Dec 02, 2010 at 01:50:09AM -0500, derek fong wrote:
> Hello,
>
> Here's my scenario, hope someone can help me out with it:
>
> I created a branch (b1) from trunk several months ago. Since then, my branch
> has undergone active development while the trunk has undergone a couple of
> rela
Thu, 2 Dec 2010 01:50:09 -0500, /derek fong/:
> (...)
> [f...@localhost] ~/sandbox/temp/_merged/repo: svn stat
> C .
> ? dir_conflicts.prej
> ! C application
> > local delete, incoming edit upon merge
>
> I think I understand why that's happening, but what's the best
> way
