Wireshark · Wireshark-dev: Re: [Wireshark-dev] Conflicts: field in commit messages

[ronnie sahlberg <ronniesahlberg@xxxxxxxxx>]

My 5 cent :   I think they should be removed.



On Mon, Oct 6, 2014 at 12:03 PM, Bálint Réczey <balint@xxxxxxxxxxxxxxx> wrote:
> Hi All,
>
> I usually leave the "Conflicts: ..." in the commit message after
> resolving conflicts to document that the merge was not automatic.
> Should I continue doings so you prefer removing this from the commit message?
> Guy raised the issue in https://code.wireshark.org/review/#/c/4438 ,
> but I think the question deserves more attention than being just a
> valid code-review comment.
>
> Cheers,
> Balint
> ___________________________________________________________________________
> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives:    http://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>              mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe