Wireshark mailing list archives
Re: Conflicts: field in commit messages
From: Guy Harris <guy () alum mit edu>
Date: Tue, 7 Oct 2014 00:34:10 -0700
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
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)