Steps to merge a long running feature branch, using a squash

feature-branch.bash

steps to squash and merge a lot running feature branch:

# on feature branch {guest-crm}, make a clean space to play
git checkout guest-crm
git checkout -b package-guest-crm
# here, find a commit before the first you want to use in the squash
git rebase -i 1f98b7a26a9874105

# on this screen, keep the first commit as "pick", for everything below, switch pick to s or squash
# save

# now, prepare the space off of master to merge in

git checkout master
git checkout -b merge-guest-crm
git merge package-guest-crm # this may cause some conflicts; that's ok, we can resolve them once and then we're done

# resolve those potential conflicts

# now test the merge version

git checkout master
git pull origin master # get any last changes that might conflict
git merge merge-guest-crm

git push origin master