On 11/11/2020 12:07 PM, Elijah Newren wrote: > On Wed, Nov 11, 2020 at 5:58 AM Derrick Stolee <stolee@xxxxxxxxx> wrote: >> This seems simple enough to have a duplicate copy lying >> around. Do you anticipate that all common code will live >> in the same file eventually? Or will these two static err() >> method always be duplicated? > > I anticipate that merge-recursive.[ch] will be deleted. > > merge-ort was what I wanted to modify merge-recursive.[ch] to be, but > Junio suggested doing it as a different merge backend since it had > invasive changes, so that we could have an easy way to try it out and > fallback to the known good algorithm until we had sufficient comfort > with the new algorithm to switch over to it. OK, I missed that context. Your approach is fine as long as these are not going to both exist forever. Thanks, -Stolee
