On Fri, Aug 11, 2017 at 08:58:46PM +, Blaine Whittle wrote:
> I'm a big fan of the auto tree conflict resolution feature.
>
> One optimization I'd like to suggest is after a tree conflict is found, and
> if the two branches share ancestry then branch move history search should be
> constrain
On Fri, Aug 11, 2017 at 09:26:14PM +, Blaine Whittle wrote:
> I'm seeing different behavior with automatic conflict resolver when operating
> against a 1.10.0-alpha3 compared to a 1.7.10 server. I'm using a
> 1.10.0-alpha3 client.
>
> Test case
>
> * Create branch B from branch A.
>
