Changes between Version 80 and Version 81 of DevWikiComitGuidelines

Timestamp:

Feb 19, 2022, 3:07:54 PM (2 years ago)

Author:

robe

Comment:

—

DevWikiComitGuidelines

@@ -46 +46 @@
        For small changes where there is no ticket and there is a pull request or patch, reference to these e.g. github/gitlab/gitea pull request link is sufficient
     3. If you are given a patch or pull request from a community person, note their name in both the commit log entry and NEWS file.
-    4. To close a ticket or pull request you can add to your commit log  Closes #[xyz]  where xyx is the trac ticket, or  Closes [link to pull request].  Our trac system has a hook to automatically close these on trac and our git mirrors. *DO NOT USE THE MERGE BUTTON* on pull requests.
+    4. To close a ticket or pull request you can add to your commit log  Closes #[xyz]  where xyx is the trac ticket, or  Closes [link to pull request].  Our trac system has a hook to automatically close these on trac and our git mirrors. **DO NOT USE THE MERGE BUTTON** on pull requests.
        Do instead to merge changes into your local git and then push to our primary repo. This can be done using git merge or using the git patch link of the pull request (on all systems it's the git pull url with .patch or .diff at the end) and applying the patch.