You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/09/01 11:51:16 UTC
[commons-build-plugin] branch master updated: Refer to master branch only and drop reference to trunk branch name
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 495c109 Refer to master branch only and drop reference to trunk branch name
495c109 is described below
commit 495c109eb958830b75dc23779b477fb8b6cad970
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 1 07:51:13 2022 -0400
Refer to master branch only and drop reference to trunk branch name
---
CONTRIBUTING.md | 2 +-
src/main/resources/commons-xdoc-templates/contributing-md-template.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d02572b..bd49bbf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,7 +61,7 @@ Making Changes
--------------
+ Create a _topic branch_ for your isolated work.
- * Usually you should base your branch on the `master` or `trunk` branch.
+ * Usually you should base your branch on the `master` branch.
* A good topic branch name can be the JIRA bug id plus a keyword, e.g. `COMMONSSITE-123-InputStream`.
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
+ Make commits of logical units.
diff --git a/src/main/resources/commons-xdoc-templates/contributing-md-template.md b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
index 8e5b32b..803dc8c 100644
--- a/src/main/resources/commons-xdoc-templates/contributing-md-template.md
+++ b/src/main/resources/commons-xdoc-templates/contributing-md-template.md
@@ -61,7 +61,7 @@ Making Changes
--------------
+ Create a _topic branch_ for your isolated work.
- * Usually you should base your branch on the `master` or `trunk` branch.
+ * Usually you should base your branch on the `master` branch.
* A good topic branch name can be the JIRA bug id plus a keyword, e.g. `@JIRA_ID@-123-InputStream`.
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
+ Make commits of logical units.