This is a nice article, however steps 9 and 10 should be swapped.
First you pull the updated master and then you remove the feature branch. Otherwise you will need to force branch delete (git branch -D) because your local repo doesn't know yet that the branch is already merged. And forcing is not nice ;).
This is a nice article, however steps 9 and 10 should be swapped.
First you pull the updated master and then you remove the feature branch. Otherwise you will need to force branch delete (git branch -D) because your local repo doesn't know yet that the branch is already merged. And forcing is not nice ;).
Cheers!
yes this is right --- I will edit! And you are correct that forcing anything isn't nice at all.
Thank you for the improvement!