automatic conflict resolution for argument clinic generated files?

[asottile]

For example, this backport could have been automated (the only conflict was on the AC hashes):

• bpo-31938: Fix default-value signatures of several functions in the select module cpython#21066
• [3.9] bpo-31938: Fix default-value signatures of several functions in the select module (GH-21066) cpython#21097
• [3.8] bpo-31938: Fix default-value signatures of several functions in the select module (GH-21066) cpython#21098

perhaps even a custom merge driver could be written for this?

[Mariatta]

Yeah.. I think this is same issue brought up in python/miss-islington#41

[asottile]

sweet, let's continue the discussion there!