title: How to squash the commits before I merge into master?
body: <p>I branched out from master and worked in my new branch branchA, I made a few commits in branchA and merged master now and then into branchA to keep it updated with the latest change. Now I want to squash my commits into one commit before I merge into master, what should I do? I know <code>git merge --squash</code> can squash the commits. However, I don't want to merge it now because I'm waiting for code review approval. It's not good to use rebase too because I merged master into branchA, I'm wondering if there is any good way to squash the commits. Thanks!</p>