Re: keep_local in harvest_committables

Neels J Hofmeyr <neels_at_elego.de> writes:

> The bottom line is: simply remove that madly misguided entry->keep_local
> conditional and always call bail_on_tree_conflicted_children(). The rest of
> the patch is mending the test suite to be sensible about it. Will do.

See r943722 for a slightly different approach. If you want to change
it further that's fine by me.

-- 
Philip