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

fix(inline): Fail update on conflict #347

Merged
merged 4 commits into from
Jul 10, 2024
Merged

fix(inline): Fail update on conflict #347

merged 4 commits into from
Jul 10, 2024

Commits on Jul 10, 2024

  1. fix(assert): Don't panic on update failure

    @epage
    epage committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    079c06b View commit details
    Browse the repository at this point in the history

  2. test(inline): Verify overlapping inline sources

    @epage
    epage committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    90d34b8 View commit details
    Browse the repository at this point in the history

  3. fix(inline): Fail update on conflict

    @epage
    epage committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1face20 View commit details
    Browse the repository at this point in the history

  4. fix(inline): Don't fail if overlapping patches are the same

    @epage
    epage committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c2589c4 View commit details
    Browse the repository at this point in the history