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

When merging a branch, the commit message should refer to the branch, not the commit

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Fixed
    • 0.9.1.2
    • Git
    • None
    • Windows 7

    • 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.

      Since introduction of Source Tree into our organisation, it has been difficult to track merging between branches. This is due to merging a revision, rather than a branch.

      Steps to reproduce..
      1.) Open Source Tree
      2.) Open a repository
      3.) Checkout branch [INSERT NAME OF BRANCH TO MERGE INTO]
      4.) Click 'merge' button. Tree is displayed.
      5.) Select revision "1234567" marked as head of branch "origin/fb_anexamplebranch"

      Expected:
      "Merge remote-tracking branch 'remotes/origin/fb_anexamplebranch' into preprod
      Conflicts:
      html/resources/css/modules.css
      "

      Actual:
      The message includes the commit hash code.

              sstreeting Steve Streeting (Inactive)
              2b327561e96c James Rickards
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: