Wireshark mailing list archives
Re: Wireshark code review
From: Alexis La Goutte <alexis.lagoutte () gmail com>
Date: Wed, 25 Mar 2015 07:56:59 +0100
On Wed, Mar 25, 2015 at 7:10 AM, Anil <anilkumar911 () gmail com> wrote:
Hi All -- I have done a mistake with submitting code for review. My initial review is https://code.wireshark.org/review/#/c/7751 <https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c> I fixed the issues reported there and have checked in the new changes. The problem is that the new changes are in a different branch than the original one. So it has created a new review https://code.wireshark.org/review/#/c/7802/ I need some help about what can be done now ? Hi Anil,
You need to "squash" your 2 commit in one commit with the same changeId like review 7751 You can use git rebase -i origin and for second commit replace pick by squash (or fixup) and for future update, you only need to use git commit -a --amend More information available here http://wiki.wireshark.org/Development/SubmittingPatches --Anil
___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev () wireshark org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-request () wireshark org ?subject=unsubscribe
___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev () wireshark org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-request () wireshark org?subject=unsubscribe
Current thread:
- Wireshark code review Anil (Mar 24)
- Re: Wireshark code review Alexis La Goutte (Mar 24)
- Re: Wireshark code review Dario Lombardo (Mar 25)
- Re: Wireshark code review Niels de Vos (Mar 25)
- Re: Wireshark code review Alexis La Goutte (Mar 25)
- Re: Wireshark code review Dario Lombardo (Mar 25)