floppydiscen/git-workshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use switch and not checkout

Browse Source
This commit is contained in:
Bjarke Sporring
2026-01-07 22:04:44 +01:00
parent f48eefee10
commit c057fd617b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
01_essentials/03-branching/setup.ps1
View File

@@ -76,10 +76,10 @@ Write-Host "`n=== Setup Complete! ===" -ForegroundColor Green
Write-Host "`nYour challenge environment is ready in the 'challenge/' directory." -ForegroundColor Cyan Write-Host "`nYour challenge environment is ready in the 'challenge/' directory." -ForegroundColor Cyan
Write-Host "`nNext steps:" -ForegroundColor Cyan Write-Host "`nNext steps:" -ForegroundColor Cyan
Write-Host " 1. cd challenge" -ForegroundColor White Write-Host " 1. cd challenge" -ForegroundColor White
Write-Host " 2. Create a new branch: git checkout -b feature-login" -ForegroundColor White Write-Host " 2. Create a new branch: git switch -c feature-login" -ForegroundColor White
Write-Host " 3. Create login.py and commit it" -ForegroundColor White Write-Host " 3. Create login.py and commit it" -ForegroundColor White
Write-Host " 4. Make another commit on the feature branch" -ForegroundColor White Write-Host " 4. Make another commit on the feature branch" -ForegroundColor White
Write-Host " 5. Switch back to main: git checkout main" -ForegroundColor White Write-Host " 5. Switch back to main: git switch main" -ForegroundColor White
Write-Host " 6. Observe that login.py doesn't exist on main!" -ForegroundColor White Write-Host " 6. Observe that login.py doesn't exist on main!" -ForegroundColor White
Write-Host " 7. Run '..\verify.ps1' to check your solution" -ForegroundColor White Write-Host " 7. Run '..\verify.ps1' to check your solution" -ForegroundColor White
Write-Host "" Write-Host ""

4
01_essentials/05-merge-conflicts/setup.ps1
View File

@@ -60,7 +60,7 @@ git add config.json
git commit -m "Add timeout configuration" | Out-Null git commit -m "Add timeout configuration" | Out-Null
# Switch to feature branch: Add debug setting (conflicting change) # Switch to feature branch: Add debug setting (conflicting change)
git checkout update-config | Out-Null git switch update-config | Out-Null
$featureConfig = @" $featureConfig = @"
{ {
@@ -78,7 +78,7 @@ git add config.json
git commit -m "Add debug mode configuration" | Out-Null git commit -m "Add debug mode configuration" | Out-Null
# Switch back to main branch # Switch back to main branch
git checkout main | Out-Null git switch main | Out-Null
# Return to module directory # Return to module directory
Set-Location .. Set-Location ..