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

[Backport] Fix rebase conflict detection in git 2.26 (#10929) #10930

Merged
merged 2 commits into from
Apr 3, 2020
Merged

[Backport] Fix rebase conflict detection in git 2.26 (#10929) #10930

merged 2 commits into from
Apr 3, 2020

Commits on Apr 2, 2020

  1. Fix rebase conflict detection in git 2.26 

    Git changed the technique used in rebase from
simple apply-patches to use merge. This breaks
our conflict detection code.

created by: Andrew Thornton <art27@cantab.net>
    @6543
    6543 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    d90735d View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge branch 'release/v1.11' into backport-git2.26-fix

    @lafriks
    lafriks authored Apr 3, 2020
    Configuration menu
    Copy the full SHA
    55429cc View commit details
    Browse the repository at this point in the history