Merge the main development branch into your feature branch

merge-base.sh

##
# merges a branch into current branch to keep up to date with the base (default master)
# usage: be-merge [branch]
# Make sure you are on the right branch before you run this command
#
function merge-base() {
  git checkout ${1-master}
  git pull
  git checkout -
  git merge ${1-master}
}