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

A way to quit merge with external merge tool without affecting "Working Copy Changes"

    XMLWordPrintable

Details

    • Suggestion
    • Status: Closed (View Workflow)
    • Resolution: Won't Fix
    • None
    • General
    • None
    • Win 8 x64, TortoiseGit
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

    Description

      1. Start merging changes from another branch with some conflicting files as a result (Git is used).
      2. Launch external merge tool via context menu in "Working Copy Changes"
      Problem: if I decide to quit external merge tool for some reason without finishing merge, the file from "Working Copy Changes" is moved to "Staged Changes". If I decide to restart merge later, I need to memorize file name and find it in "Staged Changes" first.

      Suggestion: either button "Abort" in "View Merge In Progress" should prevent file from being moved to "Staged Changes" or there should be another way to do it.

      Attachments

        Activity

          People

            sstreeting Steve Streeting (Inactive)
            df4da0dd479a Mykola Denysiuk
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: