Steem Ruby Tutorial Code

53 lines (45 with data), 1.9 kB

#!/opt/local/bin/zsh
############################################################# {{{1 ##########
#  Copyright © 2019 … 2020 Martin Krischik «krischik@users.sourceforge.net»
#############################################################################
#  This program is free software: you can redistribute it and/or modify
#  it under the terms of the GNU General Public License as published by
#  the Free Software Foundation, either version 3 of the License, or
#  (at your option) any later version.
#
#  This program is distributed in the hope that it will be useful,
#  but WITHOUT ANY WARRANTY; without even the implied warranty of
#  MERCHANTABILITY or ENDIFFTNESS FOR A PARTICULAR PURPOSE.  See the
#  GNU General Public License for more details.
#
#  You should have received a copy of the GNU General Public License
#  along with this program.  If not, see «http://www.gnu.org/licenses/».
############################################################# }}}1 ##########
#
# Sync develop and master:
#
# ⑴ pull current version from server
# ⑵ merge server version of develop with local develop
# ⑶ merge server version of master with local master
# ⑷ merge develop to the current branch
#
# This is needed to merge develop into your feature branch to avoid merger
# confict within the pull requests.
#

setopt Err_Exit
setopt No_XTrace

local Current_Branch=$(git branch | grep "*" | cut -d ' ' -f2)

git stash push
git fetch --all
git fetch --prune
git fetch --tags

git checkout    "master"
git merge       "FETCH_HEAD"

git checkout    "develop"
git merge       "FETCH_HEAD"

git checkout    "${Current_Branch}"
git merge       --no-ff "develop"
git stash pop

############################################################ {{{1 ###########
# vim: set nowrap tabstop=8 shiftwidth=4 softtabstop=4 expandtab :
# vim: set textwidth=0 filetype=zsh foldmethod=marker nospell :