From 60aa44f42d34c050a20228462bf6bf380752b057 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 18 Jul 2013 14:43:41 -0400 Subject: [PATCH] DOC: added a note on commit comments for merges with Conflicts --- DEVELOP | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOP b/DEVELOP index b0f7b47e..61248393 100644 --- a/DEVELOP +++ b/DEVELOP @@ -253,6 +253,10 @@ Use the text "closes #333"/"resolves #333 "/"fixes #333" where 333 represents an issue that is closed. Other text and details in link below. See: https://help.github.com/articles/closing-issues-via-commit-messages +If merge resulted in conflicts, clarify what changes were done to +corresponding files in the 'Conflicts:' section of the merge commit +message. See e.g. https://github.com/fail2ban/fail2ban/commit/f5a8a8ac + Adding Actions --------------