Hacker News Reader

Push the feature branch if they existed for more than a day or so. They would be cleaned up by the merger/pull request verifier once in master.

Feature branches are pushed to remote, where code reviews can take place. Once the code is reviewed and approved, the submitter rebases it onto master. We run a batched continuous integration, so once it's on master, it is expected it could be pushed into production at any time (batched because somebody has to do the push manually, usually after merging the code).

Interesting because you'll get the cleanest history possible, however have you ever had an issue when the rebasing post code review would have had unintended effect (and not caught by a reviewer) ?

Neither. We rebase feature branches on top on master or release branch and enforce --only-ff. This assures a straight and clean history except for the cases when there are several release branches.

Every feature branch is pushed to the remote, with a pull request to merge into our integration branch.

Merge feature branches to a common dev branch then we branch off QA builds and RCs from there.