Can't Merge Production Branch with current Branch

XMLWordPrintable

    • Type: Bug
    • Resolution: Resolved Locally
    • Priority: Highest
    • None
    • Affects Version/s: 1.8.2
    • Component/s: 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
          27 kB
          Christian Moreno
        2. merging error.png
          8 kB
          Christian Moreno
        3. mergingFileStatus.png
          26 kB
          Christian Moreno

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

              Created:
              Updated:
              Resolved: