Skip to content

Instantly share code, notes, and snippets.

@altherlex

altherlex/merge-branches.sh

Created June 25, 2020 01:13
Show Gist options
  • Save altherlex/e2caf39c6d33be6fca91456cc6c101c1 to your computer and use it in GitHub Desktop.
Save altherlex/e2caf39c6d33be6fca91456cc6c101c1 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge-branches.sh
#!/bin/sh
#
# This script should be run via curl:
# sh -c "$(curl -fsSL https://gist.githubusercontent.com/altherlex/15315bebfd9bc65ffb02fad8f899b6a6/raw/azure-auto-changelog.sh)"
# or wget:
# sh -c "$(wget -qO- https://gist.githubusercontent.com/altherlex/15315bebfd9bc65ffb02fad8f899b6a6/raw/azure-auto-changelog.sh)"
# export USER=alther.alves
# export PASSWORD=1234
# export ORIGINAL_BRANCH=release/2.5
# export HOTFIX_BRANCH=release/2.4
export HUSKY_SKIP_HOOKS=1
sudo git clone https://$USER:[email protected]/GetSmartSolutions/The%20Product/_git/Product-Web
cd Product-Web
sudo git fetch origin $ORIGINAL_BRANCH $HOTFIX_BRANCH
sudo git checkout $ORIGINAL_BRANCH
sudo git merge $HOTFIX_BRANCH --no-edit
sudo git push origin $ORIGINAL_BRANCH
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment