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.

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

Prevent f-string merge quote changes with nested quotes #4498

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Prevent f-string merge quote changes with nested quotes #4498

wants to merge 7 commits into from

Commits on Oct 22, 2024

  1. Prevents string merges from changing f-string quotes

    @MeGaGiGaGon
    MeGaGiGaGon committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    0a710e0 View commit details
    Browse the repository at this point in the history

  2. Changelog and docs updates

    @MeGaGiGaGon
    MeGaGiGaGon committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c2437e7 View commit details
    Browse the repository at this point in the history

  3. typo fix

    @MeGaGiGaGon
    MeGaGiGaGon committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    7bb170e View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Merge branch 'psf:main' into prevent-f-string-merge-quote-changes

    @MeGaGiGaGon
    MeGaGiGaGon authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    79a2f2d View commit details
    Browse the repository at this point in the history

  2. Update outdated sentences in trans.py

    @MeGaGiGaGon
    MeGaGiGaGon committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    559de44 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Relax condition for rejecting string merge

    @MeGaGiGaGon
    MeGaGiGaGon committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    bcfb0fd View commit details
    Browse the repository at this point in the history

  2. Fix mess created by forgetting to pull

    @MeGaGiGaGon
    MeGaGiGaGon committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    1c62371 View commit details
    Browse the repository at this point in the history