Re: Conflicts: field in commit messages

[Michal Labedzki <michal.labedzki () tieto com>]

You miss one thing - cherry-pick with conflicts is not the same that
original commit. It may build and work in 99% cases of original use,
but may file because one conflicts can be "not correctly" resolved. In
short: commit with "Conflicts" can be different than original commit.

I also saw commits with "Conflicts: " in Linux kernel:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=aa0818c6ee8d8e4772725a43550823347bc1ad30

> That appears to happen automatically when you use Gerrit to do the cherry-pick.

But I saw commit and cherry-pick
(4342d0f7a28cd31271b6d9f9116ee05e90ac44da,
f57f0555ea7781b196f771ae27cd7a9abd4ab1f1) , so probably this parameter
is not used by people.

On 7 October 2014 09:34, Guy Harris <guy () alum mit edu> wrote:
> On Oct 7, 2014, at 12:17 AM, Michal Labedzki <michal.labedzki () tieto com> wrote:
>
> > I think that "Conflicts:" should be kept. It has some values. It means
> > that cherry-pick/merge is not clean, so human or machine try to
> > resolve conflicts. It may fail.
>
> When I see it, "Conflicts:" just means "you'll have to try to manually resolve the conflicts and, if you can't, just 
> give up and either don't do anything or reimplement the fix atop the older code base".  Once that's done, there 
> aren't any conflicts any more, so....
>
> > Also Conflicts say: "be careful, maybe
> > you do not want to cherry-pick this commit" (or... maybe you want this
> > commit if destination branch is close to branch with this cherry-pick
> > [so maybe no/or less number of conflicts]).
>
> That's the same thing - "you'll have to try to manually resolve the conflicts and, if you can't, just give up and 
> either don't do anything or reimplement the fix atop the older code base".
>
> > 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.
>
> That appears to happen automatically when you use Gerrit to do the 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



-- 

Pozdrawiam / Best regards
-------------------------------------------------------------------------------------------------------------
Michał Łabędzki, Software Engineer
Tieto Corporation

Product Development Services

http://www.tieto.com / http://www.tieto.pl
---
ASCII: Michal Labedzki
location: Swobodna 1 Street, 50-088 Wrocław, Poland
room: 5.01 (desk next to 5.08)
---
Please note: The information contained in this message may be legally
privileged and confidential and protected from disclosure. If the
reader of this message is not the intended recipient, you are hereby
notified that any unauthorised use, distribution or copying of this
communication is strictly prohibited. If you have received this
communication in error, please notify us immediately by replying to
the message and deleting it from your computer. Thank You.
---
Please consider the environment before printing this e-mail.
---
Tieto Poland spółka z ograniczoną odpowiedzialnością z siedzibą w
Szczecinie, ul. Malczewskiego 26. Zarejestrowana w Sądzie Rejonowym
Szczecin-Centrum w Szczecinie, XIII Wydział Gospodarczy Krajowego
Rejestru Sądowego pod numerem 0000124858. NIP: 8542085557. REGON:
812023656. Kapitał zakładowy: 4 271500 PLN
___________________________________________________________________________
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