Wireshark mailing list archives
Re: Conflicts: field in commit messages
From: Guy Harris <guy () alum mit edu>
Date: Tue, 7 Oct 2014 10:29:46 -0700
On Oct 7, 2014, at 1:12 AM, Michal Labedzki <michal.labedzki () tieto com> wrote:
You miss one thing - cherry-pick with conflicts is not the same that original commit.
That's what "with manual intervention" is for, as per my earlier message.
It may build and work in 99% cases of original use, but may file because one conflicts can be "not correctly" resolved.
Presumably "fail" means "fail at run time" rather than "fail to build". When I see "Conflicts:" in a commit message, it reads to *me* as if either 1) somebody forgot to resolve the conflicts and is committing the broken result or 2) somebody resolved the conflicts but forgot to edit the commit message. ___________________________________________________________________________ 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
Current thread:
- Conflicts: field in commit messages Bálint Réczey (Oct 06)
- Re: Conflicts: field in commit messages Pascal Quantin (Oct 06)
- Re: Conflicts: field in commit messages ronnie sahlberg (Oct 06)
- Re: Conflicts: field in commit messages Guy Harris (Oct 06)
- Re: Conflicts: field in commit messages Michal Labedzki (Oct 07)
- Re: Conflicts: field in commit messages Guy Harris (Oct 07)
- Re: Conflicts: field in commit messages Michal Labedzki (Oct 07)
- Re: Conflicts: field in commit messages Guy Harris (Oct 07)
- Re: Conflicts: field in commit messages Bálint Réczey (Oct 07)
- Re: Conflicts: field in commit messages Michal Labedzki (Oct 08)
- Re: Conflicts: field in commit messages Bálint Réczey (Oct 26)
- Re: Conflicts: field in commit messages Michal Labedzki (Oct 07)
- Re: Conflicts: field in commit messages Alexis La Goutte (Oct 07)