From 07f427f2657c81a2d73c15a0c08c67471640005d Mon Sep 17 00:00:00 2001 From: Spunkie Date: Sun, 18 Jun 2017 15:29:18 -0600 Subject: [PATCH] Modified git plugin for branch merging Signed-off-by: Spunkie --- AU/Plugins/Git.ps1 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/AU/Plugins/Git.ps1 b/AU/Plugins/Git.ps1 index 1496562b..e18b2417 100644 --- a/AU/Plugins/Git.ps1 +++ b/AU/Plugins/Git.ps1 @@ -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