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

Commit any conflicts during v1 backport to simplify release process #1032

Merged
merged 6 commits into from
Apr 26, 2022
Merged

Commit any conflicts during v1 backport to simplify release process #1032

merged 6 commits into from
Apr 26, 2022

Commits on Apr 14, 2022

  1. Commit any conflicts during v1 backport to simplify release process 

    The process of creating the v1 release can run into merge conflicts. We
commit the unresolved conflicts so a maintainer can easily resolve them
(vs erroring and requiring maintainers to reconstruct the release
manually).
    @henrymercer
    henrymercer committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    f6312f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases

    @henrymercer
    henrymercer committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    b3bf557 View commit details
    Browse the repository at this point in the history

  3. Add a PR check to check for conflict markers 

    This check is primarily intended to validate that any merge conflicts in
the v2 -> v1 backport PR are fixed before the PR is merged.
    @henrymercer
    henrymercer committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    5b5ed44 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Suggest resolving conflicts by adding new commits vs amending the mer… 

    …ge commit

This gives us slightly messier git history, but more importantly makes
reviewing substantially easier.
    @henrymercer
    henrymercer committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    074853a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases

    @henrymercer
    henrymercer committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    2b8fdb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2022

  1. Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases

    @henrymercer
    henrymercer committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    d2d14ad View commit details
    Browse the repository at this point in the history