Re:Still All on One Server: Perforce at Scale (2011) [pdf]
by fredsted on Thursday July 26, 2018 @12:45PM
(#17618827)
Does everyone in your company push to master all the time? Or is it different PRs being merged all the time?
Re:Still All on One Server: Perforce at Scale (2011) [pdf]
by toast0 on Thursday July 26, 2018 @02:34PM
(#17619736)
Pretty much yes. We like to push to master, and then push to production. Some teams cherry pick changes to a deployment branch and deploy from there instead of master.
Edit to add: We may be "doing it wrong", but this is the least effort way to do centralized development.
Re:Still All on One Server: Perforce at Scale (2011) [pdf]
by asah on Saturday July 28, 2018 @01:06PM
(#17633962)
No seriously, consider git branches. It's gotten 100x easier to create, manage, and merge branch pull requests. Most projects I join these days in fact "lock" master and you are forced to develop in branches.
CVS was nice(ish) since changes were independent, any number of people could check in code to limit of io parallelism. Svn was nice, the server would wait for a lock and if my changes didn't conflict, they would be applied after the rest of the pending commits. Git is a PITA, large companies build elaborate systems to queue commits, but we're not big enough to use that yet.