From c94466952f09236c0b6938ceca4e45168b63861e Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 6 Nov 2025 21:38:38 -0500 Subject: [PATCH] misc updates --- 01_materials/04_git_clone_add_push.md | 2 +- 03_instructional_team/git_05_repo_setup_script.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/01_materials/04_git_clone_add_push.md b/01_materials/04_git_clone_add_push.md index 23071e7..cc90778 100644 --- a/01_materials/04_git_clone_add_push.md +++ b/01_materials/04_git_clone_add_push.md @@ -33,7 +33,7 @@ Let's rename the instructor repo to `upstream`, meaning where we get our changes Then set our fork as the `origin`. ```bash -git remote mv origin upstream +git remote rename origin upstream git remote -v git remote add origin https://github.com/[your-username]/recipe-book.git git remote -v diff --git a/03_instructional_team/git_05_repo_setup_script.sh b/03_instructional_team/git_05_repo_setup_script.sh index 3b28edf..962d9f9 100644 --- a/03_instructional_team/git_05_repo_setup_script.sh +++ b/03_instructional_team/git_05_repo_setup_script.sh @@ -14,7 +14,7 @@ echo "" echo "1. Creating repository..." mkdir -p team-playlist-demo cd team-playlist-demo -git init +git init -b main echo "✓ Repository initialized" echo "" @@ -122,4 +122,4 @@ echo " 1. git merge Max-song-change (should succeed)" echo " 2. git merge Em-song-change (will conflict!)" echo "" echo "Repository ready for demonstration!" -echo "==========================================" \ No newline at end of file +echo "=========================================="