News for hackers. Stuff that matters.
Re:How I learned to stop worrying and push to master by DougBTX on Friday December 17, 2021 @04:32AM (#29589878)
Yes, a good middle ground is the slightly confusingly named “GitHub flow”: https://docs.github.com/en/get-started/quickstart/github-flo...

The main branch is always stable, releasable. Feature branches are branches off main, which are then merged back into main. No develop or release branches.

It is like trunk based development, especially if branches are kept short and regularly rebased onto origin/main, but with a point to run PR checks before merging.

Re:How I learned to stop worrying and push to master by pydry on Friday December 17, 2021 @06:52AM (#29590983)
This is how most people I know develop and have done for years but I've never heard anybody ever call it "github flow".
Re:How I learned to stop worrying and push to master by Traubenfuchs on Friday December 17, 2021 @07:31AM (#29591281)
I also lifted an eyebrow at this. It‘s just „trunk based development with feature branches and prs“.
Re:How I learned to stop worrying and push to master by pydry on Friday December 17, 2021 @09:33AM (#29592664)
It reminded me of when Microsoft used to pay people to say "just bing it".
Re:How I learned to stop worrying and push to master by the_fury on Friday December 17, 2021 @10:25AM (#29593406)
The term predates the Microsoft acquisition by a number of years.
Re:How I learned to stop worrying and push to master by CRConrad on Saturday December 18, 2021 @06:54PM (#29609943)
Re:How I learned to stop worrying and push to master by dpark on Friday December 17, 2021 @09:38AM (#29592725)
I think it acquired this name to distinguish from “git flow”, an alternative way to use git that is, put politely, somewhat of a maintenance headache.

https://www.atlassian.com/git/tutorials/comparing-workflows/...

Re:How I learned to stop worrying and push to master by pydry on Friday December 17, 2021 @09:50AM (#29592881)
I agree gitflow is annoying but this name sounds more like a cringey excuse to attach a Microsoft trademark to a common practice to me.
Re:How I learned to stop worrying and push to master by dpark on Friday December 17, 2021 @10:17AM (#29593258)
The term “GitHub flow” existed prior to the Microsoft acquisition. The GitHub documentation history would be definitive, but you can find articles dating back to 2014 discussing GitHub Flow vs GitFlow. The acquisition was in 2018.

I agree that the name isn’t the best. It is however at least specific. “Trunk based development” encompasses a class of development processes. Although I don’t think I’ve ever actually described a real world process as “GitHub Flow” because almost no one knows what it specifically is anyway.

Disclosure: I work for Microsoft.

Re:How I learned to stop worrying and push to master by CRConrad on Saturday December 18, 2021 @06:53PM (#29609937)
Still just a cringey excuse to attach a trademark to a common practice, only sans the "Microsoft".

(OK, "git flow" was in a way even worse; that was Atlassian trying to usurp the generic "git" name for their own particular flow.)

Re:How I learned to stop worrying and push to master by dpark on Saturday December 18, 2021 @11:56PM (#29611460)
> Still just a cringey excuse to attach a trademark to a common practice, only sans the "Microsoft".

I don't understand any of this sentence. Of course it's "sans Microsoft". It predated the acquisition by years.

But also I don't see the "cringe" here. "GitHub flow" was introduced as "this is what we do at GitHub". It is (or at least was?) the GitHib flow. https://githubflow.github.io/

> OK, "git flow" was in a way even worse; that was Atlassian trying to usurp the generic "git" name for their own particular flow.

Atlassian didn't even create GitFlow. https://nvie.com/posts/a-successful-git-branching-model/

I don't understand this mindset that starts with assuming everyone is essentially a bad actor.

Re:How I learned to stop worrying and push to master by CRConrad on Sunday December 19, 2021 @04:47PM (#29618756)
> I don't understand this mindset that starts with assuming everyone is essentially a bad actor.

It's pretty hilarious how some people use "I don't understand..." to imply that whatever it is they don't understand is bad, apparently completely oblivious to how it actually speaks more to their own powers of comprehension.

Re:How I learned to stop worrying and push to master by dpark on Monday December 20, 2021 @11:23PM (#29633841)
I often say "I don't understand..." because I'm willing to concede that sometimes my viewpoint is incorrect and I'm interested in correcting my views. Also because sometimes saying "I don't understand" is enough to get someone who holds an invalid/incorrect/unhelpful belief to restate their viewpoint clearly enough that they can see the problem with it (but of course that requires the other party to actually engage in a constructive way). And sometimes I say "I don't understand" because it's just more polite than insulting the the misinformed person.

For example, when I said "I don't understand" to your "Still just a cringey excuse..." comment, what I was really saying was "this sentence is poorly written and hard to understand, and you also clearly don't understand the context of where the term actually came from".

When I said "I don't understand" about assuming people are bad actors, I was really saying "you seem to be using the assumption of bad intent to mask your ignorance about the things you're talking about".

So now, I'll say I don't understand why you're nitpicking my use of the phrase "I don't understand" instead of responding to anything of substance I said.

By this of course I mean that it's clearly easier for you to attack my intellect than for you to self-reflect.

Re:How I learned to stop worrying and push to master by carwyn on Friday December 17, 2021 @07:11AM (#29591134)
Very similar to GitHub Flow is trunk based development:

https://trunkbaseddevelopment.com/