diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2013-07-28 19:43:54 +1000 |
|---|---|---|
| committer | Daniel Black <grooverdan@users.sourceforge.net> | 2013-07-28 19:43:54 +1000 |
| commit | d5291517a70f3048abed757ec81c70f8fac2c1d6 (patch) | |
| tree | cdbe0815ebbc99b938c7b7f460c6e1cf54f3136f /DEVELOP | |
| parent | 088e7f92aa021ea07ff72c17a7ca58772ed30f0b (diff) | |
| parent | 56faf7f5ad6f730b54e13d4340fd3996ef4893f8 (diff) | |
| download | fail2ban-d5291517a70f3048abed757ec81c70f8fac2c1d6.tar.gz | |
MISC: merge from master
Diffstat (limited to 'DEVELOP')
| -rw-r--r-- | DEVELOP | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 -------------- |