Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-2912

Interactive rebase with conflict always aborts

    XMLWordPrintable

Details

    • Bug
    • Resolution: Duplicate
    • Medium
    • None
    • 1.6.12
    • Git
    • Standalone, JDK 1.7.0_40, Windows 7 64bit

    • Severity 2 - Major

    Description

      Any time there's a conflict during interactive rebase, the Close button on the output window for the interactive rebase immediately aborts the rebase.

      To reproduce:

      • Initiate an interactive rebase with a known conflict [0]
      • Observe the output window with normal message "error: could not apply..."
      • Expected result: click the Close button and be presented with the opportunity to resolve the conflict(s) and continue the rebase
      • Actual result: click the Close button and rebase is immediately aborted

      See also SRCTREEWIN-2715 which has a slightly misleading description.

      [0] Clone https://bitbucket.org/malingo/srctreewin-2912 and attempt to interactive rebase 'other-branch' onto 'master'

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              davekaminski malingo
              Votes:
              2 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: