From 3d7c48f93462e9548bb03a80eb36d047eeb07aa7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 29 Jan 2025 01:54:55 +0000 Subject: [PATCH] differences for PR #1065 --- 01-basics.md | 7 +++---- md5sum.txt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/01-basics.md b/01-basics.md index 6633f92053..028bf32dd4 100644 --- a/01-basics.md +++ b/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 has a [Version Control with Mercurial](https://swcarpentry.github.io/hg-novice/) lesson (2013-2018), which provides additional context and historical perspective. :::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::: challenge diff --git a/md5sum.txt b/md5sum.txt index e0e72b0da9..125f03f89e 100644 --- a/md5sum.txt +++ b/md5sum.txt @@ -3,7 +3,7 @@ "LICENSE.md" "ea0c0c96819430451d30c4cb669e0c64" "site/built/LICENSE.md" "2025-01-25" "config.yaml" "69e678021a92f74f922e53d180d05f47" "site/built/config.yaml" "2023-05-08" "index.md" "a37c98b62b9cd48ff67c51cea5240a1f" "site/built/index.md" "2024-09-29" -"episodes/01-basics.md" "78184e84f5bf3b0dd88de3918e927591" "site/built/01-basics.md" "2024-06-20" +"episodes/01-basics.md" "d305d8155247ab90d4ad43c4311868d6" "site/built/01-basics.md" "2025-01-29" "episodes/02-setup.md" "169455416b0e7425b6e3e4a956104471" "site/built/02-setup.md" "2025-01-25" "episodes/03-create.md" "c1198fc3106059d83fd8078d57fbbfef" "site/built/03-create.md" "2024-09-29" "episodes/04-changes.md" "43e427542c4d80636e63b5905528cf49" "site/built/04-changes.md" "2025-01-25"