Elijah Newren <newren@xxxxxxxxx> writes: > On Thu, Mar 12, 2020 at 8:13 AM Emily Shaffer <emilyshaffer@xxxxxxxxxx> wrote: >> ... >> This broke quite a few upstream users for us today... One more thing I've been wondering was if we should really have said "ok, the two known gotchas have been dealt with, so let's ship it". It is quite likely that users may be hit by remaining differences between the merge and apply backends that we assume to be merely subtle and easy-to-work-around ones, and it may be prudent to use the "let's not change the default just yet, but ask people to test it in their workflow by advertising the configuration" patch.