Hi, On 29/05/2020 16:21, Arne Schwabe wrote: > Am 29.05.20 um 15:51 schrieb David Sommerseth: >> On 29/05/2020 01:54, Arne Schwabe wrote: >>> +# Merge 'reformatting' branch into master >>> +1f004b2f06e987d73e48f7fd7b96b0b248274f58 >> >> Are you sure this "merge" commit shouldn't be commit 81d882d5 instead? >> > > I am not sure to be honest, that is why I included both commits as > ignoring the merge commit might be instead then showing the other commit.
merge commits are normally there to solve conflicts..or to do nothing. The conflict might be related to the reformatting (so you think we may want to hide it)...but I think we should not ignore it in any case as resolving a conflict is potentially a source of bugs. Regards, -- Antonio Quartulli _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
