News for hackers. Stuff that matters.
Re:Please stop recommending Gitflow by somacert on Wednesday March 04, 2020 @05:02PM (#22488641)
I will admit I would not know the difference between gitflow and a hole in the ground. But that diagram looks an awful lot like the workflow you tend to pick up when using fossil.

  * The primary dev branch
  * branch and merge for feature development
  * long term branch for each release.
The authors only real concern appeared to be no rebase, and rebase is already a big no-no in any sort of distributed development, just adopt that attitude for your personal development.
Re:Please stop recommending Gitflow by cryptonector on Wednesday March 04, 2020 @06:18PM (#22489210)
> rebase is already a big no-no in any sort of distributed development

You are ill-informed on this subject, and I have a proof-by-existence.

Sun Microsystems, Inc., used a rebase workflow from the mid-90s all the way until the end, at least for the codebases that made up Solaris (OS/Net and other consolidations), and it did so while using a VCS that did not support rebase out of the box (Teamware, over NFS). It was essentially a git rebase workflow years before Larry McVoy created BitKeeper, and even more years before Git was created, and even more years before the rebase vs. merge workflow controversies.

When I was at Sun we had ~2,000 developers on mainline Solaris. The rebase workflow worked fantastically well.

Large projects had their own repositories that were rebased periodically, and team members would base their clones on the project's clone (known as a "gate").

Large projects' gates would get archived for archeological interest.

All history upstream was linear. No. Merge. Commits. (We called them "merge turds", and they were a big no-no.)

Solaris development was undeniably distributed development.

Re:Please stop recommending Gitflow by dvdgsng on Wednesday March 04, 2020 @05:52PM (#22489036)
> The authors only real concern appeared to be no rebase

This is my take as well. That blog post has not much to say about anything, mostly weak points stemming from personal distaste of some things, but it boils down to 'i like rebase more'.