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

Can't Merge Production Branch with current Branch

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Resolved Locally
    • Icon: Highest Highest
    • None
    • 1.8.2
    • UX

      When I click Merge "Production" into current branch the confirm message is:

      "Are you sure you want to merge 'File Status' into your current branch?" (see attachment)

      ----------------------------------------------------
      Merge file status (see attachment):

      git -c diff.mnemonicprefix=false -c core.quotepath=false merge "File Status"
      merge: File Status - not something we can merge

      Completed with errors, see above.
      -----------------------------------------------------

      Note: Same issues is happening when I try to merge any two branches using the right click "merge xxx into current branch", or try to delete a branch (attachment).

      See like the selection on the tree is not working properly and every time it jumps to the top of the tree, that is "File Status".

        1. deleteIssue.png
          deleteIssue.png
          27 kB
        2. merging error.png
          merging error.png
          8 kB
        3. mergingFileStatus.png
          mergingFileStatus.png
          26 kB

              Unassigned Unassigned
              ffb0d7faf75f Christian Moreno
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: