Git Merge Flow

merge.sh

# git config --global alias.pushf "push --force-with-lease"
# git config --global alias.mnff "merge --no-ff"

BRANCH="epic/CompraEnApp/feature/layout-helper"
DEVELOP="epic/CompraEnApp/develop"

git checkout $DEVELOP && git pull

git checkout $BRANCH

# create backup
git push origin $BRANCH:"spike-$BRANCH"

# may rise conflicts, solve them as they appear
git rebase $DEVELOP
git pushf origin

git checkout $DEVELOP

git mnff $BRANCH

git push origin $DEVELOP