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

[Bálint Réczey <balint@xxxxxxxxxxxxxxx>]

2014-10-08 11:41 GMT+02:00 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])
+1