Non-fast-forward message for ff-only merges reads poorly for cross-repository pull requests

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Low
    • 4.4.0
    • Affects Version/s: 2.4.0
    • Component/s: None
    • None

      When a repository is configured for --ff-only merges, if a cross-repository pull request fails to merge because it's not fast-forward, the error message is useless if the fork's branch name matches the target repository's branch name:

      KEY/slug is configured to require fast-forward merges, but master includes commits which have not been merged to master. To perform this merge, master must first be merged into master.

      In a same-repository pull request this couldn't happen because both branches must have different names. But when merging in changes from a fork, those changes can be applied on a branch with the same name as the destination being targeted upstream.

      When performing a cross-repository merge, the source branch should be qualified with the project key and repository slug for the source repository.

        1. FF_ONLY_FORK.png
          82 kB
          Juan Palacios
        2. FF_ONLY_SAME_REPO.png
          74 kB
          Juan Palacios
        3. MERGE_FAILED_FORK.png
          81 kB
          Juan Palacios
        4. MERGE_FAILED_SAME_REPO.png
          74 kB
          Juan Palacios

              Assignee:
              Bryan Turner (Inactive)
              Reporter:
              Bryan Turner (Inactive)
              Votes:
              1 Vote for this issue
              Watchers:
              6 Start watching this issue

                Created:
                Updated:
                Resolved: