Re: Merge blocked: the source branch must be rebased onto the target branch.

["Mora, Jorge via Wireshark-dev" <wireshark-dev () wireshark org>]

Thank you John for the explanation, I thought I was doing something wrong. I will just wait for someone to review it.


--Jorge

From: Wireshark-dev <wireshark-dev-bounces () wireshark org> on behalf of "Mora, Jorge via Wireshark-dev" 
<wireshark-dev () wireshark org>
Reply-To: Developer support list for Wireshark <wireshark-dev () wireshark org>
Date: Friday, August 27, 2021 at 10:11 AM
To: Developer support list for Wireshark <wireshark-dev () wireshark org>
Cc: "Mora, Jorge" <Jorge.Mora () netapp com>
Subject: Re: [Wireshark-dev] Merge blocked: the source branch must be rebased onto the target branch.

NetApp Security WARNING: This is an external email. Do not click links or open attachments unless you recognize the 
sender and know the content is safe.


Hello,

Sorry, I forgot to give the merge request.
It is for MR 3976, a few weeks ago I submitted the same fix (MR: 3863) but I did close it because of the same issue and 
created the new request but the same thing happened.


--Jorge

From: Wireshark-dev <wireshark-dev-bounces () wireshark org> on behalf of Graham Bloice <graham.bloice () trihedral com>
Reply-To: Developer support list for Wireshark <wireshark-dev () wireshark org>
Date: Friday, August 27, 2021 at 10:06 AM
To: Developer support list for Wireshark <wireshark-dev () wireshark org>
Subject: Re: [Wireshark-dev] Merge blocked: the source branch must be rebased onto the target branch.

NetApp Security WARNING: This is an external email. Do not click links or open attachments unless you recognize the 
sender and know the content is safe.

Is this for MR 3863 (https://gitlab.com/wireshark/wireshark/-/merge_requests/3863) or MR 3976 
(https://gitlab.com/wireshark/wireshark/-/merge_requests/3976), or something else?

On Fri, 27 Aug 2021 at 17:01, Mora, Jorge via Wireshark-dev <wireshark-dev () wireshark org<mailto: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?

Thanks,

--Jorge



--
Graham Bloice

___________________________________________________________________________
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-request () wireshark org?subject=unsubscribe