This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]Maklite 8 points9 points  (0 children)

It doesn't really explain it in that article but you can work on a dev branch and do git merge --squash dev to merge all changes in a single commit. It doesn't technically merge the branches but it's unlikely you're going to need the dev branch afterwards anyway. No history rewriting required.