feat: make merge-conflicts more explicit

2026-01-07 23:03:18 +01:00
parent dff82c847c
commit eb63970b7a
2 changed files with 444 additions and 68 deletions
--- a/01_essentials/05-merge-conflicts/verify.ps1
+++ b/01_essentials/05-merge-conflicts/verify.ps1
@@ -128,7 +128,8 @@ if ($parentCount -ne 2) {
 }

 # Check that both branches are merged
-$branches = git branch --merged 2>$null
+$branches = git branch --merged update-config 2>$null
+Write-Host "$branches $($branches -notmatch 'update-config')"
 if ($branches -notmatch "update-config") {
    Write-Host "[FAIL] The 'update-config' branch was not merged." -ForegroundColor Red
    Set-Location ..