Re: Conflicts: field in commit messages

[Guy Harris <guy () alum mit edu>]

On Oct 6, 2014, at 12:03 PM, Bálint Réczey <balint () balintreczey hu> 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.

Back when we were using SVN, the convention Gerald (and some others) used was to have backport checking messages be of 
the form

        Copied over XXX from the trunk:

        [commit message from the trunk]

or


        Copied over XXX from the trunk with manual intervention:

        [commit message from the trunk]

or something such as that.

Is there any advantage to listing the files that required manual intervention?

Is there any advantage to saying "with manual intervention" rather than "Conflicts:"?

Is there any advantage to mentioning the manual intervention if the only issues were white space issues?
___________________________________________________________________________
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