On Fri, Aug 27, 2021, 12:01 PM Mora, Jorge via Wireshark-dev < wireshark-dev@wireshark.org> wrote:
> Hello, > > I have been trying to push this fix but I don’t know what I am doing wrong > and what I need to do for this fix to be reviewed. I have not received any > e-mails that something is wrong but I did see the merge has been blocked. > > Can anybody tell me why am I getting this merge blocked? > The merge being blocked is not a concern unless there are conflicts between other commits and your changes Wireshark uses a restrictive merge policy that only allows fast-forward commits. What that means is that if any other change has been committed since you branched, your fix has to be rebased to include those commits. You will see that message about being blocked until you rebase. The Gitlab GUI makes this very easy if there are no merge conflicts, as there's a button that either you or a reviewer can push to rebase. If there are merge conflicts, then there's a little more work, as described on the Wiki and documentation. Reviewing is a different matter, and you will have to wait for one of the core developers to review and approve it. If there are no conflicts, then the same developer who reviews it will also rebase it for you when approving the merge. John Thacker
___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
