5 ms·
Quick question for people using git daily : do you push the features branches to a central repo or you simpy merge with --no-ff on a common dev branch ? (There
by seren 12y ago
Quick question for people using git daily : do you push the features branches to a central repo or you simpy merge with --no-ff on a common dev branch ?
(There is no necessarily a right answer, but I'd like to know what is more usual)
- krisgee 12y agoMerge feature branches to a common dev branch then we branch off QA builds and RCs from there.
- jimktrains2 12y agoPush 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.
- bleuarff 12y agoEvery feature branch is pushed to the remote, with a pull request to merge into our integration branch.
- SoftwareMaven 12y agoFeature 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).
- seren 12y agoInteresting 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) ?
- yxhuvud 12y agoNeither. 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.