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

Update merge-main-into-feature-branch script #1420

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Update merge-main-into-feature-branch script #1420

merged 2 commits into from
Aug 7, 2023

Commits on Aug 7, 2023

  1. Before creating the merge-main PR, branch it off main, so merge confl… 

    …icts can be addressed in the branch rather than by committing to main.
    @jonsimantov
    jonsimantov committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    5597163 View commit details
    Browse the repository at this point in the history

  2. Format.

    @jonsimantov
    jonsimantov committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    5a17677 View commit details
    Browse the repository at this point in the history