git-upstream

  1. Bug #1625876
  2. Comment #4

Comment 4 for bug 1625876

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix merged to git-upstream (master)

Reviewed: https://review.openstack.org/378520
Committed: https://git.openstack.org/cgit/openstack/git-upstream/commit/?id=54d48766ae177f2d8d75704962f4e90cc35fb95d
Submitter: Jenkins
Branch: master

commit 54d48766ae177f2d8d75704962f4e90cc35fb95d
Author: Darragh Bailey <email address hidden>
Date: Wed Sep 28 12:12:12 2016 +0100

    Always have rebase perform finish

    To ensure consistent behaviour around encountering conflicts whether in
    interactive mode or not, or whether there are changes to be carried or
    not, always have rebase perform the finish step whenever the merge
    behaviour is enabled.

    Change-Id: I8f72ebb9fb0fa9fff4943e732cbf4f7d33672837
    Related-Bug: #1625876