On Tue, Jun 07, 2011 at 07:08:44PM +0100, Jon Foster wrote:
> Hi,
>
> I'm having trouble resolving a tree conflict.
>
> I'm working on a feature branch, and I regularly merge from trunk to the
> branch. In my latest merge, I got a tree conflict because a directory
> ("playback") has been added b
Hi,
I'm having trouble resolving a tree conflict.
I'm working on a feature branch, and I regularly merge from trunk to the
branch. In my latest merge, I got a tree conflict because a directory
("playback") has been added both to trunk and to my branch, with
different contents. I want to get rid
