gdha / mismas Goto Github PK

Merging the upstream/master with your local branch ...
...
# Checkout your local 'master' branch.
$ git checkout master

# Synchronize your local repository with 'upstream/master', so that you have all the latest changes.
$ git fetch upstream

echo "
Show current branch - should be master"
git branch
echo "
Fetch upstream
"
git fetch upstream

echo "
Checkout local 'master' branch
"
git checkout master
echo "
Fetch upstream
"
git fetch upstream

echo "
Check that current local branch is 'master'
"
if ! test master = $( git branch | cut -s -d '*' -f 2 ) ; then
   echo "Error: Current local branch is not 'master'"
   exit 1
fi
echo "
Fetch upstream
"
git fetch upstream

current_branch=( $( git branch | grep '^* ' ) )

echo "${current_branch[@]}"

test master = $( git branch | cut -s -d '*' -f 2 )