Uber git workflow

Feb 4, 2011Download as KEY, PDF0 likes634 views

Glenn Roberts

Git workflow tips - local branching and release management. Presented at RubyFuZa 2011, Cape Town.

...To Squash Commits...
Glenn Roberts
@glennrob
glenn.roberts@siyelo.com

...During an Interactive
Rebase...
Glenn Roberts
@glennrob
glenn.roberts@siyelo.com

...In My Uber Git
Workﬂow...
Glenn Roberts
@glennrob
glenn.roberts@siyelo.com

...Which Uses
Branching & Merging...
Glenn Roberts
@glennrob
glenn.roberts@siyelo.com

... Like a Boss.
Glenn Roberts
@glennrob
glenn.roberts@siyelo.com

Sorry Farrel, already used up all my
slide quota

• Why your git workﬂow is important
• How we do it @ Siyelo
• Random slides to ﬁll the last 4
minutes of a 5 minute talk.

• feature branches
• commit early, often
• interactive rebase, squash
• ship that mother.

• old branch labels
• partial/no squashing (OK)
• nasty git log
• whats in a feature?
• whats in a feature-set?

1. The Major Branches

Text

Author: Vincent Driessen
Original blog post: http://nvie.com/archives/323
License: Creative Commons

1a) Merge like a Boss with --no-ff

Text

Author: Vincent Driessen
Original blog post: http://nvie.com/archives/323
License: Creative Commons

1b) Always merge with intent
--no-ff on the ‘major’ branches

[branch "dev"]
mergeoptions = --no-ff --no-commit
[branch "master"]
mergeoptions = --no-ff --no-commit

Every merge is sacred
fetch and rebase instead

1c) Nice merge commit changelog

# ~/.gitconfig
[merge]
summary = true

Merge branch 'v0.9.5'

* v0.9.5: (25 commits)
refactor ambiguous budget? & spend? methods
fix failing specs

2. Release Branches
dev release branches master

Start of release
branch for
1.0

From this point on,
“next release” means
Only bug xes!
the release after 1.0

Tag
1.0

Bug xes merged
back into dev

Author: Vincent Driessen
Original blog post: http://nvie.com/archives/323
License: Creative Commons

3. Hotﬁx Branches

Author: Vincent Driessen
Original blog post: http://nvie.com/archives/323
License: Creative Commons

• [dev] branch
• keep stable
• rebase feature branches
• avoid pulling
• use merge commits (--no-ff )
• use release & hotﬁx branches
• [master] commit == a release.

j/k. Git Flow is rad.
But understand the basics ﬁrst.

Share and Enjoy!

Author: Glenn Roberts
Rubyfuza 2011
License: Creative Commons

Slides for my lightning talk at Config Management Camp 2016. See the video here: https://youtu.be/qJ0VNO6z68M Writing Vagrantfiles is tedious, especially when you’re setting up a multi-VM environment. Typically, people will copy/paste code blocks that define hosts, but that becomes unwieldy. However, a Vagrantfile is “just” Ruby, so can’t we simplify things a bit using the power of the language? Turns out, we can! In this presentation I propose a reusable Vagrantfile that reads the configuration of the environment from a simple YAML file. See my blog post about this at https://bertvv.github.io/notes-to-self/2015/10/05/one-vagrantfile-to-rule-them-all/

maXbox starter46 work with WineMax Kleiner

Upgrade your mongo the right way linkedinLior Altarescu

The document provides guidance on upgrading a MongoDB replica set from version 3.4 to 4.0. It recommends upgrading one slave node at a time to the next version, thoroughly testing applications after each upgrade. All nodes must be on the same version before changing the feature compatibility version. The process involves upgrading binaries while the replica set remains available, testing applications, remastering to the upgraded node, and changing the compatibility version before repeating for the next upgrade. Thorough testing at each stage is emphasized.

Drools Cylande Chtijug 2010Nicolas Heron

This document summarizes a presentation on Jboss Drools and Drools Planner given on January 21, 2010. It provides background on Ch'ti JUG, the publisher of software dedicated to retail companies. It then outlines key concepts of Drools Expert for implementing business logic, patterns for matching data, and how production rule systems work with a repository of facts and rules that can insert, update and retract from working memory. Finally, it discusses additional Drools capabilities like ruleflow, conditional elements, and timers/calendars.

Bulletinphew_artwork

Mnemonic And Illustrationphew_artwork

Phew Artworkphew_artwork

Git flow workflow exampleSamúel Jón Gunnarsson

This document provides an overview of Git Flow, a branching model for Git. It describes the basic workflow including feature branches, release branches, hotfixes, and how each type of branch is used. Key aspects of Git Flow covered are parallel development on feature branches, using release branches to prepare releases, and hotfix branches for emergency fixes to production. Benefits include increased clarity, collaboration and control over releases. The document also provides examples of commands for each part of the Git Flow process.

Git version controlDavid Xie

How We Use GitHubNYC DevShop

Git workflowsThuc Le Dong

The document discusses Git workflows, comparing centralized and feature branch workflows. It then describes Vincent Driessen's branching model which uses two main branches (master and develop) and three supporting branch types (feature, release, hotfix). The master branch is stable and used for production, while develop is integrated features. Feature branches branch off develop for new work, and release branches prepare releases by merging to develop and master. Hotfix branches fix production issues. The model aims to support collaboration while keeping branches stable. Special cases in applying the model are also addressed.

Gitflow Modelkenziii

Collaborative development with gitJoseluis Laso

Git is a source control management system that allows developers to work collaboratively by controlling versions from a central repository. Each team member has a local copy of the repository. Commands are used to upload and download changes from the central repository. Best practices for collaboration include using branches like develop and feature branches, and following a roadmap of branching, testing, merging into develop, and releasing to production.

Gitlab and LingvokotLingvokot

SubversionTomy Ismail

Gitflow - Una metología para manejo de BranchesJavier Alvarez

This document describes GitFlow, a Git branching model for managing code development. It outlines the main branches (master, develop/edge), feature branches for new work, release branches for final testing, and hotfix branches for critical fixes. Feature branches are merged into develop/edge after completion. Release branches are created from develop/edge for final testing before being merged to master and tagged. Hotfix branches address critical issues directly in master. The GitFlow workflow provides a robust model for team collaboration and code releases.

Svn Basic TutorialMarco Pivetta

BSADD-Git-TRAININGbsadd

This document discusses the key features and benefits of Git, a popular distributed version control system. It describes how Git allows for remote collaboration by multiple users on codebases through features like branching, merging, and tracking changes. Instructions are provided on how to set up Git locally and connect a repository to an online hosting service like GitHub or Bitbucket to enable remote access and synchronization between team members.

Bsadd training-gitMaksud Chowdhury

A Git Workflow Model or Branching StrategyVivek Parihar

Vivek Parihar is a serial entrepreneur and polyglot engineer who currently serves as VP of Engineering at XOXODay. He has co-founded two startups and previously served as Head of Engineering for Mobile at Yatra. When not working, he enjoys extreme thrill-seeking adventures like trekking and boxing. The document then outlines Gitflow, a branching model for managing code development, including feature branches for new features, release branches to prepare releases, and hotfix branches for urgent bug fixes in production.

GIT BasicsTagged Social

Lightning branches at RedMart (Js conf Asia 2014 Talk)Ritesh Angural

SVN Information RAHUL TRIPATHI

A short guide to git's interactive rebaseOmbu Labs, The Lean Software Boutique

Git's interactive rebase allows developers to clean up and edit commits before publishing them. It can be used to squash multiple commits into one, reorder commits, or drop unwanted commits and move them to a new branch to keep feature and bugfix branches more logically separated. The interactive rebase is started with `git rebase -i` which opens an editor showing the commits to allow picking, editing, squashing or dropping them.

GitFlow WorkshopSyed Imam

SVN Tool Information : Best PracticesMaidul Islam

Git basics a starter on git and its ecosystemFrançois D'Agostini

Git is a distributed version control system that allows for non-linear development. It uses a local repository that tracks snapshots of files rather than file differences. The document discusses how to configure Git, create repositories, make commits, view commit histories, work with branches, merge branches, resolve conflicts, work with remote repositories, and leverage tools like Git stash and Git hosting platforms. Popular branching strategies like Git flow are also covered that establish best practices for team collaboration.

UiPath Community Berlin: Orchestrator API, Swagger, and Test Manager APIUiPathCommunity

Join this UiPath Community Berlin meetup to explore the Orchestrator API, Swagger interface, and the Test Manager API. Learn how to leverage these tools to streamline automation, enhance testing, and integrate more efficiently with UiPath. Perfect for developers, testers, and automation enthusiasts! 📕 Agenda Welcome & Introductions Orchestrator API Overview Exploring the Swagger Interface Test Manager API Highlights Streamlining Automation & Testing with APIs (Demo) Q&A and Open Discussion Perfect for developers, testers, and automation enthusiasts! 👉 Join our UiPath Community Berlin chapter: https://community.uipath.com/berlin/ This session streamed live on April 29, 2025, 18:00 CET. Check out all our upcoming UiPath Community sessions at https://community.uipath.com/events/.

Big Data Analytics Quick Research Guide by Arthur MorganArthur Morgan

This is a Quick Research Guide (QRG). QRGs include the following: - A brief, high-level overview of the QRG topic. - A milestone timeline for the QRG topic. - Links to various free online resource materials to provide a deeper dive into the QRG topic. - Conclusion and a recommendation for at least two books available in the SJPL system on the QRG topic. QRGs planned for the series: - Artificial Intelligence QRG - Quantum Computing QRG - Big Data Analytics QRG - Spacecraft Guidance, Navigation & Control QRG (coming 2026) - UK Home Computing & The Birth of ARM QRG (coming 2027) Any questions or comments? - Please contact Arthur Morgan at [email protected]. 100% human made.

More Related Content

Similar to Uber git workflow (20)

Git flow workflow exampleSamúel Jón Gunnarsson

Git version controlDavid Xie

How We Use GitHubNYC DevShop

Git workflowsThuc Le Dong

Gitflow Modelkenziii

Collaborative development with gitJoseluis Laso

Gitlab and LingvokotLingvokot

SubversionTomy Ismail

Gitflow - Una metología para manejo de BranchesJavier Alvarez

Svn Basic TutorialMarco Pivetta

BSADD-Git-TRAININGbsadd

Bsadd training-gitMaksud Chowdhury

A Git Workflow Model or Branching StrategyVivek Parihar

GIT BasicsTagged Social

Lightning branches at RedMart (Js conf Asia 2014 Talk)Ritesh Angural

SVN Information RAHUL TRIPATHI

A short guide to git's interactive rebaseOmbu Labs, The Lean Software Boutique

GitFlow WorkshopSyed Imam

SVN Tool Information : Best PracticesMaidul Islam

Git basics a starter on git and its ecosystemFrançois D'Agostini

Git flow workflow exampleSamúel Jón Gunnarsson

Git version controlDavid Xie

How We Use GitHubNYC DevShop

Git workflowsThuc Le Dong

Gitflow Modelkenziii

Collaborative development with gitJoseluis Laso

Gitlab and LingvokotLingvokot

SubversionTomy Ismail

Gitflow - Una metología para manejo de BranchesJavier Alvarez

Svn Basic TutorialMarco Pivetta

BSADD-Git-TRAININGbsadd

Bsadd training-gitMaksud Chowdhury

A Git Workflow Model or Branching StrategyVivek Parihar

GIT BasicsTagged Social

Lightning branches at RedMart (Js conf Asia 2014 Talk)Ritesh Angural

SVN Information RAHUL TRIPATHI

A short guide to git's interactive rebaseOmbu Labs, The Lean Software Boutique

GitFlow WorkshopSyed Imam

SVN Tool Information : Best PracticesMaidul Islam

Git basics a starter on git and its ecosystemFrançois D'Agostini

Recently uploaded (20)

UiPath Community Berlin: Orchestrator API, Swagger, and Test Manager APIUiPathCommunity

Big Data Analytics Quick Research Guide by Arthur MorganArthur Morgan

Special Meetup Edition - TDX Bengaluru Meetup #52.pptxshyamraj55

Splunk Security Update | Public Sector Summit Germany 2025Splunk

Complete Guide to Advanced Logistics Management Software in Riyadh.pdfSoftware Company

Explore the benefits and features of advanced logistics management software for businesses in Riyadh. This guide delves into the latest technologies, from real-time tracking and route optimization to warehouse management and inventory control, helping businesses streamline their logistics operations and reduce costs. Learn how implementing the right software solution can enhance efficiency, improve customer satisfaction, and provide a competitive edge in the growing logistics sector of Riyadh.

How analogue intelligence complements AIPaul Rowe

Artificial Intelligence is providing benefits in many areas of work within the heritage sector, from image analysis, to ideas generation, and new research tools. However, it is more critical than ever for people, with analogue intelligence, to ensure the integrity and ethical use of AI. Including real people can improve the use of AI by identifying potential biases, cross-checking results, refining workflows, and providing contextual relevance to AI-driven results. News about the impact of AI often paints a rosy picture. In practice, there are many potential pitfalls. This presentation discusses these issues and looks at the role of analogue intelligence and analogue interfaces in providing the best results to our audiences. How do we deal with factually incorrect results? How do we get content generated that better reflects the diversity of our communities? What roles are there for physical, in-person experiences in the digital world?

Into The Box Conference Keynote Day 1 (ITB2025)Ortus Solutions, Corp

IEDM 2024 Tutorial2_Advances in CMOS Technologies and Future Directions for C...organizerofv

Drupalcamp Finland – Measuring Front-end Energy ConsumptionExove

Noah Loul Shares 5 Steps to Implement AI Agents for Maximum Business Efficien...Noah Loul

Artificial intelligence is changing how businesses operate. Companies are using AI agents to automate tasks, reduce time spent on repetitive work, and focus more on high-value activities. Noah Loul, an AI strategist and entrepreneur, has helped dozens of companies streamline their operations using smart automation. He believes AI agents aren't just tools—they're workers that take on repeatable tasks so your human team can focus on what matters. If you want to reduce time waste and increase output, AI agents are the next move.

Generative Artificial Intelligence (GenAI) in BusinessDr. Tathagat Varma

DevOpsDays Atlanta 2025 - Building 10x Development Organizations.pptxJustin Reock

Building 10x Organizations with Modern Productivity Metrics 10x developers may be a myth, but 10x organizations are very real, as proven by the influential study performed in the 1980s, ‘The Coding War Games.’ Right now, here in early 2025, we seem to be experiencing YAPP (Yet Another Productivity Philosophy), and that philosophy is converging on developer experience. It seems that with every new method we invent for the delivery of products, whether physical or virtual, we reinvent productivity philosophies to go alongside them. But which of these approaches actually work? DORA? SPACE? DevEx? What should we invest in and create urgency behind today, so that we don’t find ourselves having the same discussion again in a decade?

AI and Data Privacy in 2025: Global TrendsInData Labs

In this infographic, we explore how businesses can implement effective governance frameworks to address AI data privacy. Understanding it is crucial for developing effective strategies that ensure compliance, safeguard customer trust, and leverage AI responsibly. Equip yourself with insights that can drive informed decision-making and position your organization for success in the future of data privacy. This infographic contains: -AI and data privacy: Key findings -Statistics on AI data privacy in the today’s world -Tips on how to overcome data privacy challenges -Benefits of AI data security investments. Keep up-to-date on how AI is reshaping privacy standards and what this entails for both individuals and organizations.

What is Model Context Protocol(MCP) - The new technology for communication bw...Vishnu Singh Chundawat

The MCP (Model Context Protocol) is a framework designed to manage context and interaction within complex systems. This SlideShare presentation will provide a detailed overview of the MCP Model, its applications, and how it plays a crucial role in improving communication and decision-making in distributed systems. We will explore the key concepts behind the protocol, including the importance of context, data management, and how this model enhances system adaptability and responsiveness. Ideal for software developers, system architects, and IT professionals, this presentation will offer valuable insights into how the MCP Model can streamline workflows, improve efficiency, and create more intuitive systems for a wide range of use cases.

2025-05-Q4-2024-Investor-Presentation.pptxSamuele Fogagnolo

SAP Modernization: Maximizing the Value of Your SAP S/4HANA Migration.pdfPrecisely

Cybersecurity Identity and Access Solutions using Azure ADVICTOR MAESTRE RAMIREZ

Heap, Types of Heap, Insertion and DeletionJaydeep Kale

Andrew Marnell: Transforming Business Strategy Through Data-Driven InsightsAndrew Marnell

Manifest Pre-Seed Update | A Humanoid OEM Deeptech In Francechb3

UiPath Community Berlin: Orchestrator API, Swagger, and Test Manager APIUiPathCommunity

Big Data Analytics Quick Research Guide by Arthur MorganArthur Morgan

Special Meetup Edition - TDX Bengaluru Meetup #52.pptxshyamraj55

Splunk Security Update | Public Sector Summit Germany 2025Splunk

Complete Guide to Advanced Logistics Management Software in Riyadh.pdfSoftware Company

How analogue intelligence complements AIPaul Rowe

Into The Box Conference Keynote Day 1 (ITB2025)Ortus Solutions, Corp

IEDM 2024 Tutorial2_Advances in CMOS Technologies and Future Directions for C...organizerofv

Drupalcamp Finland – Measuring Front-end Energy ConsumptionExove

Noah Loul Shares 5 Steps to Implement AI Agents for Maximum Business Efficien...Noah Loul

Generative Artificial Intelligence (GenAI) in BusinessDr. Tathagat Varma

DevOpsDays Atlanta 2025 - Building 10x Development Organizations.pptxJustin Reock

AI and Data Privacy in 2025: Global TrendsInData Labs

What is Model Context Protocol(MCP) - The new technology for communication bw...Vishnu Singh Chundawat

2025-05-Q4-2024-Investor-Presentation.pptxSamuele Fogagnolo

SAP Modernization: Maximizing the Value of Your SAP S/4HANA Migration.pdfPrecisely

Cybersecurity Identity and Access Solutions using Azure ADVICTOR MAESTRE RAMIREZ

Heap, Types of Heap, Insertion and DeletionJaydeep Kale

Andrew Marnell: Transforming Business Strategy Through Data-Driven InsightsAndrew Marnell

Manifest Pre-Seed Update | A Humanoid OEM Deeptech In Francechb3

Uber git workflow

1. Why I Use Textmate... Glenn Roberts @glennrob [email protected]

2. ...To Squash Commits... Glenn Roberts @glennrob [email protected]

3. ...During an Interactive Rebase... Glenn Roberts @glennrob [email protected]

4. ...In My Uber Git Workﬂow... Glenn Roberts @glennrob [email protected]

5. ...Which Uses Branching & Merging... Glenn Roberts @glennrob [email protected]

6. ... Like a Boss. Glenn Roberts @glennrob [email protected]

7. Sorry Farrel, already used up all my slide quota

8. • Why your git workﬂow is important • How we do it @ Siyelo • Random slides to ﬁll the last 4 minutes of a 5 minute talk.

9. Source control basics. Nailed it.

10. • feature branches • commit early, often • interactive rebase, squash • ship that mother.

11. • old branch labels • partial/no squashing (OK) • nasty git log • whats in a feature? • whats in a feature-set?

12. Evolve your team workﬂow.

13. The Nvie.com model:

14. 1. The Major Branches Text Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons

15. w/ 3 types of supporting branches...

16. 2. Feature Branches Text

17. 1a) Merge like a Boss with --no-ff Text Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons

18. 1b) Always merge with intent --no-ff on the ‘major’ branches [branch "dev"] mergeoptions = --no-ff --no-commit [branch "master"] mergeoptions = --no-ff --no-commit

19. • Stop pulling, please...

20. Every merge is sacred fetch and rebase instead

21. 1c) Nice merge commit changelog # ~/.gitconfig [merge] summary = true Merge branch 'v0.9.5' * v0.9.5: (25 commits) refactor ambiguous budget? & spend? methods fix failing specs

22. 2. Release Branches dev release branches master Start of release branch for 1.0 From this point on, “next release” means Only bug xes! the release after 1.0 Tag 1.0 Bug xes merged back into dev Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons

23. 3. Hotﬁx Branches Author: Vincent Driessen Original blog post: http://nvie.com/archives/323 License: Creative Commons

24. • [dev] branch • keep stable • rebase feature branches • avoid pulling • use merge commits (--no-ff ) • use release & hotﬁx branches • [master] commit == a release.

26. ... we dont need your witchcraft!

27. j/k. Git Flow is rad. But understand the basics ﬁrst.

28. Share and Enjoy! Author: Glenn Roberts Rubyfuza 2011 License: Creative Commons

Editor's Notes

#2: \n
#3: \n
#4: \n
#5: \n
#6: \n
#7: \n
#8: \n
#9: \n
#10: Some chaos in the repo.\n Need: An understandable model\n
#11: Rein Henrich&#x2019;s agile git workflow\n
#12: when/what to release? to staging - to prod ?\nbugfixes?\n
#13: \n
#14: Vincent Driessen\n
#15: a merge with master is a prod release by definition\n
#16: \n
#17: \n
#18: rebase origin/dev! first\n\nsquash if you want\n\n
#19: rebase origin/dev! first\n\nsquash if you want\n\n
#20: \n
#21: \n
#22: with no-ff you get a\n
#23: \n
#24: \n
#25: tasty spaghetti\n
#26: \n
#27: \n
#28: \n
#29: \n

Uber git workflow

Recommended

More Related Content

Similar to Uber git workflow (20)

Recently uploaded (20)

Uber git workflow

Editor's Notes