Optimal git merge workflow

git-merge.sh

# We will squash into master, but push the result back to our feature branch. This way we can easily open a PR for the squashed commit.

git checkout branch
# Set HEAD back to origin/master so we can merge to the correct place on remote, but keep local changes to master intact if we have them
git reset --hard origin/master
# Merge our branch to current head (origin/master set from last command). Squash to one commit.
git merge --squash origin/branch
# In the merge commit, include all commits to the branch
git commit --no-edit
# Push the squashed commit on branch so we can open a PR
git push --force-with-lease