From b532841afc5bd1496e8c2abc72e35b664886f73f Mon Sep 17 00:00:00 2001 From: "Ray A." <ra730@cam.ac.uk> Date: Fri, 20 Dec 2024 09:50:29 +0000 Subject: [PATCH 1/3] Reworked the readme to be MD file and include info about gitflow. --- README.md | 17 +++++++++++++++++ README.txt | 5 ----- 2 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 README.txt diff --git a/README.md b/README.md index 8b13789..5d11cd3 100644 --- a/README.md +++ b/README.md @@ -1 +1,18 @@ +# Cambridge D10 Profile + +## Status + +This repository is under continued development and build currently. + +The contents of this repository have not been yet released for a formal v1.0 and we may introduce breaking changes into the repository and its content without warning at any point. This is to be used at your own risk. + +If you have any questions regarding this, please contact webmaster@admin.cam.ac.uk. + +## Local development with Gitflow + +Local developmene of this repository uses gitflow. + +Setup and usage can be found here: https://danielkummer.github.io/git-flow-cheatsheet/ + +Note that all defaults should be uses during setup, so that (for example), `git flow feature start AM-123` results in a local branch named `git flow feature start feature/AM-123` diff --git a/README.txt b/README.txt deleted file mode 100644 index 70d53f9..0000000 --- a/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -This repository is under continued development and build currently. - -The contents of this repository have not been yet released for a formal v1.0 and we may introduce breaking changes into the repository and its content without warning at any point. This is to be used at your own risk. - -If you have any questions regarding this, please contact webmaster@admin.cam.ac.uk. \ No newline at end of file -- GitLab From c8cbe3fc63721d7692f23de1a96f94a8df7c2667 Mon Sep 17 00:00:00 2001 From: "Ray A." <ra730@cam.ac.uk> Date: Fri, 20 Dec 2024 09:53:12 +0000 Subject: [PATCH 2/3] Fixed typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d11cd3..66332ec 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you have any questions regarding this, please contact webmaster@admin.cam.ac. ## Local development with Gitflow -Local developmene of this repository uses gitflow. +Local development of this repository uses gitflow. Setup and usage can be found here: https://danielkummer.github.io/git-flow-cheatsheet/ -- GitLab From b81cf2be22a7b4d4e30eb8850de04813dc42e996 Mon Sep 17 00:00:00 2001 From: "Ray A." <ra730@cam.ac.uk> Date: Thu, 2 Jan 2025 09:45:00 +0000 Subject: [PATCH 3/3] Fixed typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66332ec..927408c 100644 --- a/README.md +++ b/README.md @@ -14,5 +14,5 @@ Local development of this repository uses gitflow. Setup and usage can be found here: https://danielkummer.github.io/git-flow-cheatsheet/ -Note that all defaults should be uses during setup, so that (for example), `git flow feature start AM-123` results in a local branch named `git flow feature start feature/AM-123` +Note, all defaults should be used during setup, so that (for example), `git flow feature start AM-123` results in a local branch named `git flow feature start feature/AM-123` -- GitLab