[Bug] PullRequest: merge base branch into feature branch cause "broken fork" and other errors

[6543]

if you resolve conlficts localy by mergin base branch or just click the "update button" sometimes this commit does not show up opull request packe and also CI is not triggerd

Workaround: push a empty commit to the branch afterwards

[bagasme]

@6543 Resolving conflicts locally: did you mean on your own computer (not your server)?

[6543]

yes - the problem of this bug is, it happen only some times, when adding new commits via local PC or webUI (update button)

[zeripath]

Sounds like a race

[zeripath]

Please reopen if the provided PR does not fix.