Issue #5402 resolved

Incomplete warning message (?) (BB-6593)

Santiago Payà Miralta
created an issue

Hello,

Testing some extreme pull behavior found an incomplete warning message. In a conflict the message says ' ... execute the following commands:' but no command is showed.

Attached capture.

Regards,

Santiago

Comments (9)

  1. Brodie Rao staff

    It looks like this is specific to pull requests that meet the following criteria:

    • The destination repo has multiple heads on the destination branch.
    • The merge has conflicts (with whichever head is the newest one pushed up).

    We're looking into putting out a fix so there aren't multiple warning messages.

  2. Santiago Payà Miralta reporter

    (Reply via sant...@gmail.com):

    Hello,

    Thanks a lot. In my opinion the merge conflict message needs to be corrected and showed beside the multiple heads message.

    Best regards,

    Santiago

  3. Brodie Rao staff

    The merge message doesn't make a whole lot of sense though. It would tell you to merge with only one of the destination branch heads, so you'd still end up with two heads. And what if you have conflicts with one head but not the other? It's only going to tell you about the merge with the most recently pushed head.

    It's best to resolve the multiple heads situation first before dealing with any conflicts.

  4. Log in to comment