From e1ddedda9da93214a298cb31cfbff545aec91944 Mon Sep 17 00:00:00 2001 From: Nicole Vasilevsky Date: Tue, 1 Oct 2019 13:39:46 -0700 Subject: [PATCH 1/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f847d2592f..971cccd170 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,4 +12,12 @@ 4. **For updates to relationships:** Provide details of the current axioms, why you think they are wrong or not sufficient, and what exactly should be added or removed. -On behalf of the tbn editorial team, Thanks! +## Editors Guide + +For more details, please see the [Mondo Editors Guide](https://mondo.readthedocs.io/en/latest/) + +## Mondo website + +The [Mondo website](https://monarch-initiative.github.io/mondo/) contains additional information about Mondo users and contributors (and provides links to the [Editors Guide](https://mondo.readthedocs.io/en/latest/). + +On behalf of the Mondo editorial team, Thanks! From b340d9243a8d61bed9d4cfbea623e8ba70f7d687 Mon Sep 17 00:00:00 2001 From: Nicole Vasilevsky Date: Tue, 1 Oct 2019 13:40:16 -0700 Subject: [PATCH 2/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 971cccd170..040d51e994 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,6 +18,6 @@ For more details, please see the [Mondo Editors Guide](https://mondo.readthedocs ## Mondo website -The [Mondo website](https://monarch-initiative.github.io/mondo/) contains additional information about Mondo users and contributors (and provides links to the [Editors Guide](https://mondo.readthedocs.io/en/latest/). +The [Mondo website](https://monarch-initiative.github.io/mondo/) contains additional information about Mondo users and contributors (and provides links to the [Editors Guide](https://mondo.readthedocs.io/en/latest/)). On behalf of the Mondo editorial team, Thanks! From bc706997ce7384a69b32845ed1d82d48c5fb220a Mon Sep 17 00:00:00 2001 From: Nicole Vasilevsky Date: Tue, 1 Oct 2019 13:49:45 -0700 Subject: [PATCH 3/3] Update d-github-pr-workflow.md add content about no branches off of branches --- docs/editors-guide/d-github-pr-workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/editors-guide/d-github-pr-workflow.md b/docs/editors-guide/d-github-pr-workflow.md index 0321d333b6..9fa2f4f313 100644 --- a/docs/editors-guide/d-github-pr-workflow.md +++ b/docs/editors-guide/d-github-pr-workflow.md @@ -27,7 +27,7 @@ _Updated 2019-08-19 by Nicole Vasilevsky_ ## Creating a New Working Branch with ‘git checkout’ 1. When starting to work on a ticket, you should create a new branch of the repository to edit the ontology file. -2. Make sure you are on the master branch before creating a new branch. If the terminal window is not configured to display the branch name, type: `git status` to check which is the active branch. If necessary, go to master by typing `git checkout master`. +2. Make sure you are on the master branch before creating a new branch. **Please do not create a new branch off of an existing branch (unless the situation explicitly calls for it).** If the terminal window is not configured to display the branch name, type: `git status` to check which is the active branch. If necessary, go to master by typing `git checkout master`. 3. To create a new branch, type: `git checkout -b issue-NNNNN` in the terminal window. For naming branches, we recommend using the string ‘issue-‘ followed by the issue number. For instance, for this issue in the tracker: [https://github.com/monarch-initiative/mondo/issues/673](https://github.com/monarch-initiative/mondo/issues/673), you would create this branch: `git checkout -b issue-673`. Typing this command will automatically put you in the new branch. You will see this message in your terminal window: `BICB119:ontology vasilevs$ git checkout -b issue-5 Switched to a new branch 'issue-5'