Re: Conflicts: field in commit messages

[Alexis La Goutte <alexis.lagoutte () gmail com>]

On Tue, Oct 7, 2014 at 9:34 AM, Guy Harris <guy () alum mit edu> wrote:
> On Oct 7, 2014, at 12:17 AM, Michal Labedzki <michal.labedzki () tieto com> wrote:
>
> > Also I propose to use "git cherry-pick -x"
> > when do cherry-pick to non-main branches (like master-1.10, etc.) See
> > description:
> > "       -x
> >           When recording the commit, append a line that says "(cherry
> > picked from commit ...)" to the original commit message in order to
> >           indicate which commit this change was cherry-picked from.

Thanks ! for the tip
> That appears to happen automatically when you use Gerrit to do the cherry-pick.
Yes... but when there is conflit, it is no possible to cherry-pick...


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