From a7f48da4e16a29093de29c1c41ecd150306396f3 Mon Sep 17 00:00:00 2001 From: erinmgraham Date: Tue, 21 Jan 2025 14:11:08 +1000 Subject: [PATCH 1/2] Update 01-basics.md Provide wiki link for git and mercurial and mention old carpentry lesson --- episodes/01-basics.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/episodes/01-basics.md b/episodes/01-basics.md index 6633f92053..7a0b3e2c25 100644 --- a/episodes/01-basics.md +++ b/episodes/01-basics.md @@ -71,13 +71,12 @@ Tools like [RCS](https://en.wikipedia.org/wiki/Revision_Control_System), [CVS](h many large companies. However, many of these are now considered legacy systems (i.e., outdated) due to various limitations in their capabilities. -More modern systems, such as Git and [Mercurial](https://swcarpentry.github.io/hg-novice/), +More modern systems, such as [Git](https://en.wikipedia.org/wiki/Git) and [Mercurial](https://en.wikipedia.org/wiki/Mercurial), are *distributed*, meaning that they do not need a centralized server to host the repository. -These modern systems also include powerful merging tools that make it possible for -multiple authors to work on +These modern systems also include powerful merging tools that make it possible for multiple authors to work on the same files concurrently. - +For those interested, the Carpentries have a [Version Control with Mercurial](https://swcarpentry.github.io/hg-novice/) lesson (2013-2018), which provides additional context and historical perspective. :::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::: challenge From d370499b7febe9ba915f99d40ca532ee22cd3857 Mon Sep 17 00:00:00 2001 From: erinmgraham Date: Wed, 29 Jan 2025 11:53:20 +1000 Subject: [PATCH 2/2] Update 01-basics.md - to match TC style recommendation --- episodes/01-basics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/01-basics.md b/episodes/01-basics.md index 7a0b3e2c25..028bf32dd4 100644 --- a/episodes/01-basics.md +++ b/episodes/01-basics.md @@ -76,7 +76,7 @@ are *distributed*, meaning that they do not need a centralized server to host th These modern systems also include powerful merging tools that make it possible for multiple authors to work on the same files concurrently. -For those interested, the Carpentries have a [Version Control with Mercurial](https://swcarpentry.github.io/hg-novice/) lesson (2013-2018), which provides additional context and historical perspective. +For those interested, The Carpentries has a [Version Control with Mercurial](https://swcarpentry.github.io/hg-novice/) lesson (2013-2018), which provides additional context and historical perspective. :::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::: challenge