Re: Conflicts: field in commit messages

[Pascal Quantin <pascal.quantin () gmail com>]

2014-10-06 21:03 GMT+02:00 Bálint Réczey <balint () balintreczey hu>:

> 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.

Hi Balint,

I also remove the conflicts lines as IMHO they do not bring any added
value. That said I could change my habit if other people think it is not
the *right way* to do things :)

Cheers,
Pascal.

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe