diff options
| author | Yaroslav Halchenko <debian@onerussian.com> | 2013-07-18 14:43:41 -0400 |
|---|---|---|
| committer | Yaroslav Halchenko <debian@onerussian.com> | 2013-07-18 14:43:41 -0400 |
| commit | 60aa44f42d34c050a20228462bf6bf380752b057 (patch) | |
| tree | e08df36ca3aa168cdd41eb210eb01a095f89027d /DEVELOP | |
| parent | bf05f2ac95b3ce574a1f3f2d7e987fb6c0a39e70 (diff) | |
| download | fail2ban-60aa44f42d34c050a20228462bf6bf380752b057.tar.gz | |
DOC: added a note on commit comments for merges with Conflicts
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 -------------- |