Skip to content

Commit 748727d

Browse files
Merge pull request #58 from dtxe/main
misc updates
2 parents 49d3a0a + c944669 commit 748727d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

01_materials/04_git_clone_add_push.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Let's rename the instructor repo to `upstream`, meaning where we get our changes
3333
Then set our fork as the `origin`.
3434

3535
```bash
36-
git remote mv origin upstream
36+
git remote rename origin upstream
3737
git remote -v
3838
git remote add origin https://github.com/[your-username]/recipe-book.git
3939
git remote -v

03_instructional_team/git_05_repo_setup_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo ""
1414
echo "1. Creating repository..."
1515
mkdir -p team-playlist-demo
1616
cd team-playlist-demo
17-
git init
17+
git init -b main
1818
echo "✓ Repository initialized"
1919
echo ""
2020

@@ -122,4 +122,4 @@ echo " 1. git merge Max-song-change (should succeed)"
122122
echo " 2. git merge Em-song-change (will conflict!)"
123123
echo ""
124124
echo "Repository ready for demonstration!"
125-
echo "=========================================="
125+
echo "=========================================="

0 commit comments

Comments
 (0)