Improve log output if git merge fails (Praqma case 12876)

XMLWordPrintable

    • Type: New Feature
    • Resolution: Fixed
    • Priority: Major
    • Component/s: pretested-integration-plugin
    • None
    • Environment:
      pretested-integration-plugin 2.x

      If the merge fails, you might see the following message in the console (accumulated strategy):

      Failed to merge changes.
merge: failure - not something we can merge

      The first line comes from our plugin, and second one comes from git and is the reason why the merge fails.
      This isn't obvious.

            Assignee:
            Bue Petersen
            Reporter:
            Bue Petersen
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: