I have a remote Git server, here is the scenario which I want to perform:
For each bug/feature I create a different Git branch
I keep on com
For Git
Create a new feature
via Terminal/Shell:
git checkout origin/feature/<featurename>
git merge --squash origin/feature/<featurename>
This doesnt commit it, allows you to review it first.
Then commit, and finish feature from this new branch, and delete/ignore the old one (the one you did dev on).