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

Stage area empty when merging

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Medium
    • 1.9.4
    • 1.9.3.1
    • Git
    • Mac OS X 10.9.3

    Description

      When merging branch B into branch A, and if there is a conflict or more, the stage area is empty, but the right pane shows a file selected.

      If I nervously tick the checkbox next to the "staged files", or "unstated files", the window refreshes, but the merge flow is broken, forcing me to do a hard reset.

      I can solve this by changing the view options, for example switch between "show only conflicts" and "show only pending"

      Attachments

        1. merge_screenshot.png
          67 kB
          Steve Streeting

        Issue Links

          Activity

            People

              Unassigned Unassigned
              8d0f052b8e60 Adrian von Gegerfelt
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: