Git Flow vs GitHub Flow: What You Need to Know

[@EnternodeCS]

At my company, we use "Git Flow except everyone forgot the main branch exists and not everyone understands what a feature branch is"

[@alexhyettdev]

Interesting! I have seen this at one company I worked at. We were trying to put all changes to the database in git. Main and develop always got out of sync though as we weren’t deploying from the code in source control.

[@dmoth1610]

We do GitHub flow and we publish with each commit to main (creating a docker image), but we only automatically deploy to a dev environment. Production deployment is done by hand, and not every version number is deployed there.

[@WolfElectronicS]

We use github flow, and it's sooo good compared to other teams using gitflow. We're much faster rolling out changes to prod, and since we have unit + integration tests running on our branch pipelines, we're normally sure the branch is safe to be merged to master

[@brackloon4584]

Excellent info on these branching strategies. Thanks.

[@alexhyettdev]

Thank you. Glad it was helpful!

[@eccololo]

Thank you Alex for great lecture. This video is most helpful 🙂.

[@alexvechirko_]

thanks for the video! *and the bloopers section is great!)))

[@bmfitzgerald3]

Dude, you nailed it! Great content. I request more Git goodies ... Not sure if this is in your wheelhouse, but if it is, help us all become Git masters. There is a lot of content out there, but there are also a ton of gaps past the beginner and intermediate levels. Good luck w/ the channel! Subscribed

[@alexhyettdev]

Thanks! Yes I will definitely do some more content on Git in the future, there is a lot to cover there.

[@muhammaddavlatov9824]

thank you very much, it helped to understand the difference..

[@alexhyettdev]

You’re welcome. I am glad it was helpful.

[@jjslocum3]

Read your post on HN. Great post, and best of luck on your KZbin odyssey!

[@alexhyettdev]

Thank you very much!

[@afei_yoo]

Great content. It does really help me a lot

[@rajadas6432]

Thank you. Is the Github flow same based trunk based branching strategy?

[@galileemason8813]

thank you very much it was very clear !

[@alexhyettdev]

You’re welcome, I am glad it was helpful!

[@heyamjoe]

Great video, Alex. Thanks.

[@alexhyettdev]

Thanks Joe, I am glad you liked it.

[@bladbimer]

What about having main (prod), dev (used for qa too) and feature branches (1 by dev feature) ?

[@soufianeodf9125]

But you didn’t talk about the difference between a version and a release, because you could create a new version without creating a release, can you give an explanation about this case please ? Thank you

[@OmarMcIver]

Those bloopers are what triggered my subscribe click :D Awesome-sauce.

[@alexhyettdev]

🤣 I should make that a regular thing. Wasn’t sure anyone watched until the end!

[@MatthewKennedyUK]

Do you rebase any of these?

[@DigitalLearnHub-pz6oq]

🧠obrigado irmão!

[@jcy089]

My previous state owned company introduced scrum but teams weren't cooperative and nobody used Git properly, so the new scrum master was always bouncing from team leader to team leader asking for progress 😂

[@vishalkarthik.v7209]

Actually i had doubt Aex , does the source control branches remains same regradless of the platform , suppose lets say we have 5 branches in Git , will the same be present in bitbucket and other platforms Thanks in advance!

[@alexhyettdev]

Yes they work across platform as they are just a function of git. It is possible to mirror repositories from GitHub to Bitbucket but I haven’t done it myself before.

[@vishalkarthik.v7209]

@@alexhyettdev tqsm 😁

[@vishalkarthik.v7209]

What is the diffrence between dev andsandbox system ? Kindly can you tell if you have a idea Thanks in adavance

[@alexhyettdev]

It depends on the company but places I have worked great them as the following: DEV: Every commit to develop gets deployed here. Can be unstable mainly used for developer testing. SANDBOX: I worked in payments so the sandbox environment was also open to the public to use for testing. We treated this as a pre production environment and only production ready releases went here.

[@vishalkarthik.v7209]

@alexhyettdev thank you Alex 😊

[@bonniesimon14]

A subscriber from hackernews

[@alexhyettdev]

👋 Thanks for subscribing!

[@fluffysheap]

I have never been able to comprehend why git flow has two different release branches. Development/trunk/whatever? Sure. Feature branches? Sure. Release branch? Sure. And then you have the main/master/whatever, which seems to exist only for the sake of existing. It's a pointless ritual and no one ever seems to quite know what's in there. No wonder it appeals to teams using scrum! Individual developers know what's in their own feature branches. The lead developer / whoever does the integrations and pull requests knows what's in the development branch. The testers know what's in the release branch. And absolutely no one knows what's in main/master.

[@alliedatheistalliance6776]

I think eventually we'll just discard all the agile/ scrum/ sprint nonsense and base development around git or github practises. ie no stupid daily standup and scrum master, just a merge meeting between a branch/ main master and people working on a feature branch or soemthing like that. That way you can define best practises but actually tie them down to something tangible without needing endless books on project management buzzwords.

[@windows99]

Sounds like sponsored video of GitLab

[@alexhyettdev]

Haha if @GitLab wanted to sponsor me that would be awesome. I just think it is call that you can have your self hosted Git setup.