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

refactor-reset-revert #1

Merged
floppydiscen merged 61 commits from refactor-reset-revert into main 2026-01-15 16:32:20 +00:00
Conversation 0 Commits 61 Files Changed 88 +5 -5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ced65740a3 - Show all commits

10
01-essentials/03-branching-and-merging/setup.ps1
View File

@@ -129,8 +129,8 @@ Set-Content -Path "app.py" -Value $appContent
git add .
git commit -m "Add app.py entry point" | Out-Null
# Merge feature-login into main
Write-Host "Merging feature-login into main..." -ForegroundColor Green
# Merge feature-login into $mainBranch
Write-Host "Merging feature-login into $mainBranch..." -ForegroundColor Green
git merge feature-login --no-edit | Out-Null
# ============================================================================
@@ -197,8 +197,8 @@ Set-Content -Path "README.md" -Value $readmeContent
git add .
git commit -m "Update README with setup instructions" | Out-Null
# Merge feature-api into main
Write-Host "Merging feature-api into main..." -ForegroundColor Green
# Merge feature-api into $mainBranch
Write-Host "Merging feature-api into $mainBranch..." -ForegroundColor Green
git merge feature-api --no-edit | Out-Null
# ============================================================================
@@ -270,7 +270,7 @@ git add .
git commit -m "Add configuration file" | Out-Null
# Merge feature-database (will be three-way merge since main diverged)
Write-Host "Merging feature-database into main..." -ForegroundColor Green
Write-Host "Merging feature-database into $mainBranch..." -ForegroundColor Green
git merge feature-database --no-edit | Out-Null
# Final update on main