feature-branch-flow.sh

merge as one commit

# update develop
git fetch origin
git co develop
git rebase origin/develop

# be sure that you don't have conflicts
git co <feature-branch>
git merge develop

# merge into develop
git co develop
git merge --squash <feature-branch>
git ci -m "RM-XXX: <short descr>

<long here>

"
git push origin develop

# remove local branch

git branch -D <feature-branch>

# remove remote branch, if exists

git push origin :<feature-branch>