I don't trust the local storage, I need to push from time to time. So I do WIP commits.
Yes, WIP commits are fine. But if they appear in the history of your master branch I'm coming for you!
How do you handle this? git merge --squash ? Based on experience I don't use and recommend rebase, it's too powerful and ppl brake things.
git merge --squash
I rebase before merging my feature branch. This allows me to clean up any previous commits accordingly.
rebase
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I don't trust the local storage, I need to push from time to time. So I do WIP commits.
How do you handle this?
git merge --squash?Based on experience I don't use and recommend rebase, it's too powerful and ppl brake things.
I
rebasebefore merging my feature branch. This allows me to clean up any previous commits accordingly.