Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 01_materials/04_git_clone_add_push.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 03_instructional_team/git_05_repo_setup_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 "=========================================="
echo "=========================================="