Skip to content

Commit

Permalink
Modified git plugin for branch merging
Browse files Browse the repository at this point in the history
Signed-off-by: Spunkie <[email protected]>
  • Loading branch information
Spunkie committed Jun 18, 2017
1 parent 38e57b3 commit 07f427f
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion AU/Plugins/Git.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,26 @@ $message = "AU: $($packages.Length) updated - $($packages | % Name)"
$gist_url = $Info.plugin_results.Gist -split '\n' | select -Last 1
git commit -m "$message`n[skip ci] $gist_url" --allow-empty

Write-Host "Pushing changes"
Write-Host "Pushing Master"
git push -q

Write-Host "Merging master -> dev"
git checkout -q dev
git pull -q origin dev
git merge -Xtheirs -q master
git status

Write-Host "Pushing Dev"
git push -q

Write-Host "Merging dev -> staging"
git checkout -q staging
git pull -q origin staging
git merge -Xtheirs -q dev
git status

Write-Host "Pushing Staging"
git push -q


popd

0 comments on commit 07f427f

Please sign in to comment.