On 2013/02/07, at 10:09, Stefan Sperling wrote:
> On Thu, Feb 07, 2013 at 09:19:47AM -0500, Matthew Pounsett wrote:
>>
>> I've been running into unexpected tree conflicts when updating branches from
>> the trunk, after reintegrating to the trunk where and file adds or removes
>> were involved
On Thu, Feb 07, 2013 at 09:19:47AM -0500, Matthew Pounsett wrote:
>
> I've been running into unexpected tree conflicts when updating branches from
> the trunk, after reintegrating to the trunk where and file adds or removes
> were involved in the reintegrate. I expect I'm doing something wrong
