Skip to content
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.

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

Merge identical forks #5405

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Merge identical forks #5405

merged 1 commit into from
Jul 25, 2024

Commits on Jul 24, 2024

  1. Merge identical forks

    Consider these requirements from pylint 3.2.5:
    
    ```
    Requires-Dist: dill >=0.3.6 ; python_version >= "3.11"
    Requires-Dist: dill >=0.3.7 ; python_version >= "3.12"
    ```
    
    We will split on the python version, but then we may pick a version of `dill` that's `>=0.3.7` in both branches and also have an otherwise identical resolution in both forks. In this case, we merge both forks and store only their conjoined markers.
    konstin committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    77a23ad View commit details
    Browse the repository at this point in the history