Posts Tagged ‘merge’

git: How to merge two commits into one

This entry is part 3 of 7 in the series git: useful HOWTOs
git rebase -i

and then pick the one you want to keep and squash the other