Live data from Hacker News

15 years later, Microsoft morged my diagram

nvie.com

331–340 of 427 posts

Re: 15 years later, Microsoft morged my diagram

#331
post #137

Regarding the original git-flow model: I've never had anyone able to explain to me why it's worth the hassle to do all the integration work on the "develop" branch, while relegating the master/main branch to just being a place to park the tag from the latest release. Why not just use the master/main branch for integration instead of the develop branch - like the git gods intended - and then not have the develop branc…

having a main branch allows a casual observer(management) to browse your project in the gui and see what is currently live.

I like the opportunity to force a second set of testing, and code review. Especially if the team is big enough that you can have different people doing code review for each branch.

You can also have your CI/CD do longer more thorough testing while merging to main vs development.

If it's a project with a single deployment, version tagging is kind of pointless, it's much easier to just use a branch to reflect what is live, and roll back to a merge commit if you have to. Then you can still merge directly to main in the event of a hotfix.

Re: 15 years later, Microsoft morged my diagram

#332

Earlier quoted context omitted.

Was reading the word morged thinking it was some new slang I hadn't heard of. Incredible.

I propose: Morge: when an AI agent is attempting to merge slop into your repo.

But it was created with a definition already: When an AI agent takes your work and regurgitates a worse version of it.

Re: 15 years later, Microsoft morged my diagram

#333
post #128
post #28

Similar story. I'm American but work and live outside the US, so I don't know how likely this would be if I had ordered from Amazon. But I ordered a rug for my sons' room from this country's equivalent to Amazon (that is, the most popular order-online-and-we-ship-to-you storefront in this country), and instead of what I ordered (a rug with an image showing the planets, with labels in English) I got an obviously AI-ge…

Another similar story: My aunt passed away last year, and an acquaintance of my cousin sent her one of those "hug in a box" care packages you can buy off Amazon. Except when it was delivered, this one said "hug in a boy" and "with heaetfelt equqikathy" (whatever the hell that means). When we looked up the listing on Amazon it was clear it was actually wrong in the pictures, just well hidden with well placed objects i…

Reminds me when one Valentine's Day or whatever a new booth popped up at the mall where my gym was. They sold these nice heart-shaped chocolate boxes. I bought one for my sister. When she opened it, she found one piece of chocolate, and the rest of the box was filled with blocks of Styrofoam... The next day the booth was gone.

Re: 15 years later, Microsoft morged my diagram

#334
post #137

Regarding the original git-flow model: I've never had anyone able to explain to me why it's worth the hassle to do all the integration work on the "develop" branch, while relegating the master/main branch to just being a place to park the tag from the latest release. Why not just use the master/main branch for integration instead of the develop branch - like the git gods intended - and then not have the develop branc…

having a main branch allows a casual observer(management) to browse your project in the gui and see what is currently live. I like the opportunity to force a second set of testing, and code review. Especially if the team is big enough that you can have different people doing code review for each branch. You can also have your CI/CD do longer more thorough testing while merging to main vs development. If it's a projec…

> having a main branch allows a casual observer(management) to browse your project in the gui and see what is currently live.

I never found this very compelling. What is main in that world is not the source of truth, and it's rare to have a system atomically in one state or the other - but normally there are progressive rollouts. And if you ever need to rollback in production, I assume no one is changing where main is.

> I like the opportunity to force a second set of testing, and code review. Especially if the team is big enough that you can have different people doing code review for each branch.

To be explicit for code review, do you mean there is (1) main, (1) development, and then a bunch feature branches - and that there is review when merging into development and main? Having a two-tiered review process seems extremely difficult to do - versus just having more reviewers on the first merge - especially dealing with merge conflicts and needing to merge again into development.

> You can also have your CI/CD do longer more thorough testing while merging to main vs development.

I think it's fair to do more testing later. I think the equivalent I'm used to (which is pretty close, so not a huge difference), is only building releases from the commit that passed the bigger/slower tests.

But also, assuming there are multiple deployments coming from one repo, if you block merging into main, that means you'd be blocking on all tests passing - while release branches for a given product can select a subset of tests when deciding on release candidates.

> If it's a project with a single deployment, version tagging is kind of pointless, it's much easier to just use a branch to reflect what is live, and roll back to a merge commit if you have to. Then you can still merge directly to main in the event of a hotfix.

I think it's worth maintaining the flexibility of how many releases come from a repo. Needing to fork repos just because you want another deployable release in the future seems painful to me.

Re: 15 years later, Microsoft morged my diagram

#335
post #137

Regarding the original git-flow model: I've never had anyone able to explain to me why it's worth the hassle to do all the integration work on the "develop" branch, while relegating the master/main branch to just being a place to park the tag from the latest release. Why not just use the master/main branch for integration instead of the develop branch - like the git gods intended - and then not have the develop branc…

[deleted]

Re: 15 years later, Microsoft morged my diagram

#336
post #271

Earlier quoted context omitted.

If what they described is "trunk based development", then "git flow" is just "trunk based development where the trunk is called develop and there's a branch which always has the latest release". Is that it?

Nope. Gitflow is not trunk based development.

Then what's different other than the names of the branches?

Re: 15 years later, Microsoft morged my diagram

#337

Earlier quoted context omitted.

> but I think git-flow was popular largely because of the catchy name and catchy diagram. It was because Git showed up in the era of SVN / CVS where those branching models were created because of the uh... let's just call it technical mishaps of those source control systems. Git did not have the hang ups of SVN / CVS / etc but people stuck with what was familiar.

Yup, there would have been much less Git buy-in if it weren't for git flow; people grow incredibly attached to their beloved taxonomies.

> Yup, there would have been much less Git buy-in if it weren't for git flow

I don't buy this. I've never used git-flow in life. No team I've worked for has ever used git-flow. Yet all of us have been using Git for ages. Git has been hugely successfully independently and different teams follow different Git workflows. Its success has got very little to do with git-flow.

Re: 15 years later, Microsoft morged my diagram

#338

Earlier quoted context omitted.

YouTube must be absolutely flooded with this stuff. I clicked on one about Henry the 8th, which is a story Ive heard heard 100 times but whatever. It started out normal enough, then claimed he started carrying around a staff with a human skull on the top near the end. Made up artifacts and paintings. The most egregious has to be the "World War II mechanic fixes entire allied plane arsenal with piece of wire" category…

> YouTube must be absolutely flooded with this stuff. I don't know what the current upload rate to YT is, but this seems unlikely. Despite the reckless and insane energy consumption associated with generative visual and audio art forms, there's no way there's enough power available for generative stuff to overwhelm the "actually recorded digital video" uploads. Are there some niches on YT where this is true? Seems po…

If my toilet overflows and starts leaking raw sewage into my bathroom, I don't tend to then go "well, at least the rest of my house is fine proportionally".

Most of these kind of videos aren't fully SORA level AI anyway, they just use ChatGPT to make up a fake story and script they would otherwise have to make up themselves, which is much faster, and increases the chances one of them gets picked up by the algorithm and generates a few bucks in ad revenue.

Re: 15 years later, Microsoft morged my diagram

#339

Microsoft employee (VP of something or other, for whatever Microsoft uses "VP" to mean) doing damage control on Bluesky: https://bsky.app/profile/scott.hanselman.com/post/3mez4yxty2... > looks like a vendor, and we have a group now doing a post-mortem trying to figure out how it happened. It'll be removed ASAFP > Understood. Not trying to sweep under rugs, but I also want to point out that everything is moving very f…

[deleted]

Re: 15 years later, Microsoft morged my diagram

#340

Earlier quoted context omitted.

Yup, there would have been much less Git buy-in if it weren't for git flow; people grow incredibly attached to their beloved taxonomies.

> Yup, there would have been much less Git buy-in if it weren't for git flow I don't buy this. I've never used git-flow in life. No team I've worked for has ever used git-flow. Yet all of us have been using Git for ages. Git has been hugely successfully independently and different teams follow different Git workflows. Its success has got very little to do with git-flow.

>I don't buy this.

It's not really debatable. Git flow came about because of SVN / CVS practices and was the first and for many still is THE branching model they use.

>Yet all of us have been using Git for ages

You say "all of us" but then you completely ignore the primary branching model the vast, vast majority of people use on Git.

Just for the record, this isn't being stated in support of git-flow it's just a historical fact that's not really debatable.

Post reply on HN