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

[3924] Fix merging implicit multiline strings that have inline comments #3956

Merged
merged 7 commits into from Oct 20, 2023
Merged

[3924] Fix merging implicit multiline strings that have inline comments #3956

merged 7 commits into from Oct 20, 2023

Commits on Oct 19, 2023

  1. Fix test behaviour

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    258ca48 View commit details
    Browse the repository at this point in the history

  2. Add new test cases

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    f913036 View commit details
    Browse the repository at this point in the history

  3. Skip merging strings that have inline comments

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    4848d15 View commit details
    Browse the repository at this point in the history

  4. Don't merge lines with multiline strings with inline comments

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    ffde64d View commit details
    Browse the repository at this point in the history

  5. Changelog entry

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    707b214 View commit details
    Browse the repository at this point in the history

  6. Document implicit multiline string merging rules

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    8d2b879 View commit details
    Browse the repository at this point in the history

  7. Fix PR number

    @henriholopainen
    henriholopainen committed Oct 19, 2023
    Copy the full SHA
    74d46c8 View commit details
    Browse the repository at this point in the history