From 60749c85ca394edb052064134c9ad06e15ee58af Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Fri, 25 Oct 2024 13:31:15 -0700 Subject: [PATCH] Update text including master to main so solutions work --- README.md | 3 ++- RemoteCategorySolutions | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 671213e..d3b90bc 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # LearnGitBranchingSolutions -Solutions to each and every problem available on Learn Git Branching! + +Solutions to each and every problem available on [Learn Git Branching](https://learngitbranching.js.org/)! diff --git a/RemoteCategorySolutions b/RemoteCategorySolutions index db135f3..33b1ef2 100644 --- a/RemoteCategorySolutions +++ b/RemoteCategorySolutions @@ -16,10 +16,10 @@ git fetch git pull -1.5 Fakeing Teamwork +1.5 Faking Teamwork git clone -git fakeTeamwork master 2 +git fakeTeamwork main 2 git commit git pull @@ -37,17 +37,17 @@ git commit git pull --rebase git push -1.8 Locked branch Master +1.8 Locked branch Main -git reset --hard o/master +git reset --hard o/main git checkout -b feature C2 git push -2.1 Push Master! +2.1 Push Main! git rebase side1 side2 git rebase side2 side3 - git rebase side3 master + git rebase side3 main git pull --rebase git push