process.sh

#Step 1: commit any of your current changes on the branch you're working on.

#Step 2: Create a branch locally
git checkout -b bm-cookies

#Step 3: You'll be on the bm-cookies branch now. You'll want to pull from pagoda
git pull pagoda bm-cookies

#Step 4: Checkout back to your working branch
git checkout [[NAME OF YOUR BRANCH HERE - NO BRACKETS]]

#Step 5: Merge everything on bm-cookies to your working branch
git merge bm-cookies

#Possible step 6: You need do the :wq thing we talked about last time so you're out of purgatory.
:wq

#This should everything