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

Ensure that rebase conflicts are handled in updates (#16952) #16960

Merged
merged 2 commits into from
Sep 5, 2021
Merged

Ensure that rebase conflicts are handled in updates (#16952) #16960

merged 2 commits into from
Sep 5, 2021

Commits on Sep 5, 2021

  1. Ensure that rebase conflicts are handled in updates (go-gitea#16952) 

    Backport go-gitea#16952

PR go-gitea#16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix go-gitea#16922

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Sep 5, 2021
    Configuration menu
    Copy the full SHA
    bb4e4fd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/v1.15' into backport-16952-v1.15

    @6543
    6543 authored Sep 5, 2021
    Configuration menu
    Copy the full SHA
    7299227 View commit details
    Browse the repository at this point in the history