New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

automatic conflict resolution for argument clinic generated files? #18

Closed

asottile opened this issue Jun 23, 2020 · 2 comments

asottile commented Jun 23, 2020

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

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

Member

Mariatta commented Jun 23, 2020

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

Author

asottile commented Jun 23, 2020

sweet, let's continue the discussion there!

asottile mentioned this issue

Resolve conflicts in generated files. python/miss-islington#41

Open

asottile closed this as completed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment