Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-3660

'Rebase in progress' dialog in SourceTree Mac has wrong button-action mapping

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Medium Medium
    • 2.2.5
    • 2.2.3, 2.2.4
    • None
    • None

      Summary

      If a user attempts to make a commit while in the middle of a rebase, a Rebase in Progress dialog will pop up, with 3 buttons: Cancel, Abort Rebase, Continue Rebase.

      Selecting Cancel aborts the rebase while selecting Abort rebase cancels the Commit.

      Environment

      SourceTree for Mac 2.2.3, 2.2.4

      Steps to Reproduce

      1. Initialize a git repo
      2. Create a file and commit in master branch
      3. Create branch develop
      4. Edit file in develop and commit
      5. Switch to master branch.
      6. Edit file so that it creates a conflict with the version in develop branch
      7. Commit in master branch
      8. Right-click the commit in develop, select Rebase...
      9. Confirm Rebase dialog appears, select OK
      10. A new dialog appears, warning of the conflicts. Select Close
      11. Merge Conflicts dialog appears, select OK
      12. Click Commit button from the toolbar
      13. A dialog Rebase In Progress appears, with buttons Abort Rebase, Cancel and Continue Rebase

      Expected Results

      Selecting Cancel should cancel Commit
      Selecting Abort Rebase should abort the rebase

      Actual Results

      Selecting Cancel aborts the rebase
      Selecting Abort Rebase cancels the Commit

          Form Name

            [SRCTREE-3660] 'Rebase in progress' dialog in SourceTree Mac has wrong button-action mapping

            Brian Ganninger (Inactive) added a comment -

            Thank you for your patience and the report. Our apologies for the regression and any hassles it caused. This has been addressed for the next beta and will ship in the our next minor release.

            Brian Ganninger (Inactive) added a comment - Thank you for your patience and the report. Our apologies for the regression and any hassles it caused. This has been addressed for the next beta and will ship in the our next minor release.

              Unassigned Unassigned
              tboudale Theodora Boudale
              Affected customers:
              1 This affects my team
              Watchers:
              4 Start watching this issue

                Created:
                Updated:
                Resolved: