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

Do not comment twice if backporting fails due to merge conflicts. #15050

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Do not comment twice if backporting fails due to merge conflicts. #15050

wants to merge 2 commits into from

Commits on Sep 5, 2024

  1. Do not comment twice if backporting fails due to merge conflicts. 

    Since we already posted a comment with the output of `git am`, we don't have to do it again in the exception's handler. Instead of throwing, we manually fail the step and exit.
    @teo-tsirpanis
    teo-tsirpanis authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    8aa8a07 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Simplify.

    @teo-tsirpanis
    teo-tsirpanis authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    632df27 View commit details
    Browse the repository at this point in the history