Uploaded image for project: 'Skara'
  1. Skara
  2. SKARA-391

Abort merge if source branch merge isn't fast-forward

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: P4
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.9
    • Component/s: bots
    • Labels:
      None

      Description

      When the merge bot tries to perform a merge, it first updates its local repository with the latest changes from the source branch. This update should always result in a fast-forward merge, unless a forced push has been done on the source. In that case, abort.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              rwestberg Robin Westberg (Inactive)
              Reporter:
              rwestberg Robin Westberg (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: