[Wireshark-dev] Conflicts: field in commit messages

2014-10-06 Thread Bálint Réczey
Hi All, I usually leave the Conflicts: ... in the commit message after resolving conflicts to document that the merge was not automatic. Should I continue doings so you prefer removing this from the commit message? Guy raised the issue in https://code.wireshark.org/review/#/c/4438 , but I think

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

2014-10-06 Thread Pascal Quantin
2014-10-06 21:03 GMT+02:00 Bálint Réczey bal...@balintreczey.hu: Hi All, I usually leave the Conflicts: ... in the commit message after resolving conflicts to document that the merge was not automatic. Should I continue doings so you prefer removing this from the commit message? Guy raised

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

2014-10-06 Thread ronnie sahlberg
My 5 cent : I think they should be removed. On Mon, Oct 6, 2014 at 12:03 PM, Bálint Réczey bal...@balintreczey.hu wrote: Hi All, I usually leave the Conflicts: ... in the commit message after resolving conflicts to document that the merge was not automatic. Should I continue doings so

[Wireshark-dev] Planet.wireshark.org?

2014-10-06 Thread Bálint Réczey
Hi, We had some discussions about blogging more actively on https://blog.wireshark.org/, but I think there would be an other way of making the project more active on the press side. We have a nice community and we could provide and site for aggregating Wireshark-related news from individual

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

2014-10-06 Thread Guy Harris
On Oct 6, 2014, at 12:03 PM, Bálint Réczey bal...@balintreczey.hu wrote: Hi All, I usually leave the Conflicts: ... in the commit message after resolving conflicts to document that the merge was not automatic. Should I continue doings so you prefer removing this from the commit message?