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: The behavior of development and production merge should be consistent. #694

Merged
merged 4 commits into from May 19, 2021
Merged

fix: The behavior of development and production merge should be consistent. #694

merged 4 commits into from May 19, 2021

Commits on May 11, 2021

  1. fix: The behavior of dev and production merge should be consistent.

    @ygj6
    ygj6 committed May 11, 2021
    Copy the full SHA
    aead166 View commit details
    Browse the repository at this point in the history

  2. test: add test cases.

    @ygj6
    ygj6 committed May 11, 2021
    Copy the full SHA
    055d14d View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Merge branch 'master' into keep-same-dev-and-prod

    @antfu
    antfu committed May 19, 2021
    Copy the full SHA
    59ad8d6 View commit details
    Browse the repository at this point in the history

  2. chore: fix conflict

    @antfu
    antfu committed May 19, 2021
    Copy the full SHA
    0400f91 View commit details
    Browse the repository at this point in the history