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

chore: resolve merge conflicts for upstream-58bf161 #708

Merged
merged 5 commits into from
Nov 7, 2024
Merged

chore: resolve merge conflicts for upstream-58bf161 #708

merged 5 commits into from
Nov 7, 2024

Commits on Nov 6, 2024

  1. chore(deps): prefer soft pinning on minor version for dependencies (#… 

    …9269)

* soft-pin on minor version, prefer workspace

* use workspace

* prefer workspace
    @zerosnacks
    zerosnacks authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    42f5eb9 View commit details
    Browse the repository at this point in the history

  2. Revert "fix(remappings): check if remapping to add starts with existi… 

    …ng remapping name (#9246)" (#9274)

This reverts commit 455ba9b.
    @grandizzy
    grandizzy authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    58bf161 View commit details
    Browse the repository at this point in the history

  3. Merge commit '58bf161bc9dd6e74de8cb61e3ae23f701feb5512' into upstream… 

    …-58bf161-merge
    @Jrigada
    Jrigada committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    efc398f View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Merge branch 'upstream-58bf161' into upstream-58bf161-merge-conflicts

    @Jrigada
    Jrigada authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    97cef5c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream-58bf161' into upstream-58bf161-merge-conflicts

    @Jrigada
    Jrigada authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    5b626a6 View commit details
    Browse the repository at this point in the history