git squash all commits into one and merge back into master with rebase and merge –ff-only

This is my workflow. Work in a remote branch:git checkout -b topsecretbranch Make lots of small iterative changes, committing each one with vague messages like “small changes”, “typos” and “lol”. At some point this code will be ready… Read More