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: disable required linear history on v3 branch #1018

Merged
merged 5 commits into from
Oct 12, 2021
Merged

chore: disable required linear history on v3 branch #1018

merged 5 commits into from
Oct 12, 2021

Commits on Oct 12, 2021

  1. chore: disable required linear history on v3 branch 

    This should prevent conflicts when we sync v3 with main.
    @tswast
    tswast authored Oct 12, 2021
    Configuration menu
    Copy the full SHA
    68eee2b View commit details
    Browse the repository at this point in the history

  2. try per-branch merge commits

    @tswast
    tswast authored Oct 12, 2021
    Configuration menu
    Copy the full SHA
    3b65194 View commit details
    Browse the repository at this point in the history

  3. remove unused requireLinearHistory

    @tswast
    tswast authored Oct 12, 2021
    Configuration menu
    Copy the full SHA
    8abcbff View commit details
    Browse the repository at this point in the history

  4. try requiresLinearHistory

    @tswast
    tswast authored Oct 12, 2021
    Configuration menu
    Copy the full SHA
    a81d487 View commit details
    Browse the repository at this point in the history

  5. add merge commits back

    @tswast
    tswast authored Oct 12, 2021
    Configuration menu
    Copy the full SHA
    6850c7f View commit details
    Browse the repository at this point in the history