Wireshark · Wireshark-dev: Re: [Wireshark-dev] Conflicts: field in commit messages

[Michal Labedzki <michal.labedzki@xxxxxxxxx>]

On 7 October 2014 19:29, Guy Harris <guy@xxxxxxxxxxxx> wrote:
>         2) somebody resolved the conflicts but forgot to edit the commit message.

I think this is wrong meaning  of this git feature. In my opinion
"Conflicts: " should not be deleted, because it is added by git after
resolving conflicts, so it does not mean that file has conflicts but
"there were conflicts in specified files, they was solved, but this
commit may be not compatible with original commit in these files"
(please note: there can be "Conflicts: FILE_NAME" on file that is not
in commit. This is possible because conflicts can be solved in way
that file is unchanged in that branch [quite often case])

-- 

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