On 08/16/2016 03:29 PM, yla...@apache.org wrote:
   *) autoconf: minor cleanup and removal of some dead code.
      trunk patch: http://svn.apache.org/r1753315
                   http://svn.apache.org/r1753316
      +1: jchampion
+     ylavic: some conflicts with r1753315 in 2.4.x's configure.in.

Trunk has config files that aren't present in 2.4.x, so the massive list of "files to generate" conflicts.

What's the procedure for dealing with this in STATUS when I propose something? A 2.4.x patch hosted... somewhere? Or do we just rely on proper manual resolution by whoever merges the patches?

--Jacob

Reply via email to