Git branching-model
Download as KEY, PDF4 likes4,990 views
This document outlines a Git branching model for managing code development. It describes using main branches like Master and Develop and support branches like Feature, Release, and Hotfix. The model advocates separating work into feature branches, merging them into develop, and merging develop into master upon release. It also lists tools for implementing git flow and sources for more information.
1 of 32
Downloaded 163 times
Ad
Recommended
Git and GitFlow branching model
Git and GitFlow branching modelPavlo Hodysh Version control systems like Git allow teams to collaborate on code by automatically backing up work, tracking changes over time, and easily sharing code between collaborators. Git uses repositories to store source code and a branching model like GitFlow to coordinate work between team members on features, releases, and hotfixes in a stable, collaborative way. Key concepts in Git include repositories, working copies, commits, updates, pulls, and pushes used to integrate changes between local and remote repositories.
A successful Git branching model 
A successful Git branching model abodeltae This document outlines a Git branching model to allow for smooth development with isolated features. The model uses main branches of master and develop, and support branches of feature, release, and hotfix. Feature branches isolate new work and merge back to develop. Release branches prepare releases and merge to both develop and master. Hotfix branches address urgent bugs in master and also merge to both develop and master. This model aims to allow multiple developers to work independently while reducing conflicts and enabling flexible releases and rollbacks.
A Git Workflow Model or Branching Strategy
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 branching strategies
Git branching strategiesjstack The document discusses various Git branching strategies, including:
- Common concepts like branches, merges, and pull requests
- Popular workflows like GitHub Flow and branching per platform/release
- A case study of Telenet's workflow of using long-running release branches merged from master for testing before production deployment
- Best practices like using pull requests for code reviews, keeping long-running branches stable, and ensuring features are fully tested before being merged.
Gitflow. A successful Git branching model.
Gitflow. A successful Git branching model.documarezc Gitflow Workflow is a Git workflow design that was first published and made popular by Vincent Driessen (Software Engineer from the Netherlands). The Gitflow Workflow defines a strict branching model designed around the project release. This provides a robust framework for managing larger projects.
Git workflows
Git workflowsXpand IT The document discusses several common Git workflows:
- The Basic/Centralized Workflow is the most basic, similar to SVN, with a single master branch and all changes committed directly to it.
- The Feature Branch Workflow involves branching by feature, with each developer working on their own branch before merging into master via a pull request. This avoids broken code and allows code review.
- The Gitflow Workflow manages features, releases, and hotfixes across main branches like master and develop, plus feature, release, and hotfix branches. It is more complex but provides more structure than the Feature Branch.
- The Forking Workflow differs in that there is no central repository - each developer has their own public server
Git Ready! Workflows
Git Ready! WorkflowsAtlassian How do you choose a git workflow that increases productivity and reduces the friction of your team? What are the battle tested practices of successful teams that moved to git? How is git used inside Atlassian?
As you might have heard git has many compelling features and has gained incredible momentum in the industry at large. Yet understanding how an enterprise team can adopt it can be daunting. The presentation aims to help answer these questions and more:
- Available collaboration models when using a distributed version control system like git
- Branching models that foster and enhance parallel development
- Emerging code best practices and choices that can be safely adopted when migrating to git
- How Continuous Integration changes when your team embraces git
Introduction to Git(BitBucket) , Continuous Integration (Bamboo) & Confluence 
Introduction to Git(BitBucket) , Continuous Integration (Bamboo) & Confluence Parag Gajbhiye Git is a distributed version control system that allows teams to manage multiple versions of documents and programs. Bitbucket provides Git and Mercurial hosting and integrates with Jira. Continuous integration with Bamboo automates building and testing code changes frequently to catch errors early. Confluence provides a central place for teams to share and collaborate on information.
CI is dead, long live CI
CI is dead, long live CIFrédéric Lepied This document discusses different types of continuous integration (CI) pipelines. It begins by describing staging CI, where jobs are triggered on new commits, and issues can arise if the build breaks. It then covers gating CI, used by OpenStack, where code is reviewed and tested before being merged without broken builds. Finally, it discusses doing CI yourself using open source tools like Gerrit, Zuul and Jenkins, alone or via the pre-built Software Factory project. The conclusion is that gating CI prevents broken masters and these techniques can be reused for one's own projects.
How We Use GitHub
How We Use GitHubNYC DevShop In a community setting here at WeWork Labs in NYC, Kevin McNamee, our lead developer, presented an introductory course on adding git best practices to your team's dev workflow.
Master Continuous Delivery with CloudBees Jenkins Platform
Master Continuous Delivery with CloudBees Jenkins Platformdcjuengst This document discusses the CloudBees Jenkins Platform for continuous delivery. It begins by outlining challenges that organizations face as their use of open source Jenkins grows. It then introduces the CloudBees Jenkins Platform as an enterprise-grade solution for Jenkins that provides features like high availability, security, scalability, and expert support. The document explores various components of the CloudBees Jenkins Platform, including CloudBees Jenkins Enterprise, support for cloud and containers, continuous delivery capabilities, and tools for monitoring and management at scale.
Git 101 - Crash Course in Version Control using Git
Git 101 - Crash Course in Version Control using GitGeoff Hoffman Find out why more and more developers are switching to Git - distributed version control. This intro to Git covers the basics, from cloning to pushing for beginners.
Code review vs pull request
Code review vs pull requestBryan Liu This document discusses code reviews and pull requests/merge requests. It notes that large diffs are difficult to review due to issues spotting bugs and reverting or merging changes. It recommends avoiding overloading or overcrowding reviews by keeping changes concise, contained, and guided. The document describes an Arc workflow for code reviews using Phabricator and compares post-push audits to pre-push reviews. It also discusses benefits of rebasing vs merging and integrating Phabricator with Jenkins.
Bitbucket git-bamboo-jira
Bitbucket git-bamboo-jiralenamattt The document provides information about version control systems like Git and tools from Atlassian like Bitbucket, Bamboo, and Jira. It discusses how Git is used to manage source code changes over time. It also explains how to install and configure Git, and commonly used Git commands. The document then describes how Bitbucket can be used as a code repository and linked to Jira for issue tracking. Bamboo is introduced as a tool for continuous integration and deployment that can be linked to Bitbucket and Jira as well. Steps for installing and configuring Bamboo pipelines are also outlined.
Up GitLab Presentation 2015
Up GitLab Presentation 2015Kumaran Balachandran This presentation from the University of Portland covers using GitLab for version control. It discusses creating a GitLab account, making a new project, and using GitLab on both Windows and Linux. On Windows, users can install GitHub desktop and drag project URLs to clone repositories. On Linux, commands like git clone, git add, and git push are used to clone repositories from GitLab and push new files. The presentation provides several online resources for learning more about Git and GitLab.
Trunk-Based Development
Trunk-Based DevelopmentBryan Liu What's TBD, some facts and how TBD with feature toggle can increase release frequency, lower release risk, decouple release from code deployment. DevOpsDays, Taipei, 2017
Git best practices workshop
Git best practices workshopOtto Kekäläinen The document discusses best practices for using Git including basic commands, branches, tags, and collaboration using GitHub. It covers Git fundamentals like committing, pushing, pulling and branching as well as more advanced topics such as rebasing, cherry-picking, stashing and using Git hooks for continuous integration. The presentation aims to help users learn to use Git more efficiently.
GitLab 8.5 Highlights and Step-by-step tutorial
GitLab 8.5 Highlights and Step-by-step tutorialHeather McNamee In this webcast, learn how to collaborate with GitLab. You'll see new features from GitLab 8.5 in practice. Check out our blog for more information. https://about.gitlab.com/2016/02/26/webcast-wrapup/
A painless self-hosted Git service: Gitea
A painless self-hosted Git service: GiteaBo-Yi Wu Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab. The initial development have been done on Gogs but we have forked it and named it Gitea. If you want to read more about the reasons why we have done that please read this blog post.
https://docs.gitea.io/en-us/
Why you can't ignore GitLab
Why you can't ignore GitLabPivorak MeetUp GitLab is an opinionated and integrated set of tools based on convention over configuration that offers a superior user experience. It provides features like continuous integration, static site generation, issue tracking, code review and more. The document encourages using GitLab.com for free private repositories or self-hosting. Contributing to GitLab's open source project is also presented as a way to get feedback, build your resume and potentially get a job there. The architecture follows an MVC pattern with services and finders to power its functionality.
Webinar - Continuous Integration with GitLab
Webinar - Continuous Integration with GitLabOlinData The document is a presentation about continuous integration with GitLab. It discusses what continuous integration is, why it is important, and how to set up continuous integration builds using GitLab. Specifically, it defines continuous integration as integrating code regularly to prevent problems and identify issues early. It recommends gradually adopting continuous integration practices like writing test cases whenever bugs are fixed. The presentation also provides instructions on setting up a GitLab runner to enable continuous integration builds and adding a .gitlab-ci.yml file to configure builds.
Introducing GitLab (June 2018)
Introducing GitLab (June 2018)Noa Harel This document provides an overview and agenda for introducing GitLab tools. It discusses trends in modern development like increased use of open source tools and continuous integration/deployment. GitLab is presented as a one platform solution that provides version control, issue tracking, code review, CI/CD pipelines, and other DevOps tools. Key benefits of GitLab like open source contributions and frequent releases are outlined. Upcoming features in GitLab 11 like CI pipelines in the web IDE and license management are previewed. The presentation concludes with a Q&A and information on how to get a GitLab cheat sheet.
Git Flow and JavaScript Coding Style
Git Flow and JavaScript Coding StyleBo-Yi Wu Git Flow and Coding Style discusses Git merge vs Git rebase and JavaScript coding style. It explains how Git merge creates a new commit when merging branches while Git rebase replays commits from one branch onto another branch without creating additional merge commits. It recommends rebasing the master branch and testing before creating a pull request. It also discusses the Airbnb JavaScript style guide as a good reference for code examples and styles including ES6 standards. Yoda conditions are mentioned as a style to avoid assignment errors in conditional statements. Writing unit tests is suggested to prevent coding errors.
Git in Continuous Deployment
Git in Continuous DeploymentBrett Child The document discusses using Git and continuous deployment workflows. It proposes a development model using Git branching where developers work on feature branches off a development branch. When a feature is ready, it is merged into development and then propagated to test and production branches. This allows code to be deployed frequently while separating stable and unstable code. Challenges with other version control systems like SVN are noted. Tools like scripts for multi-repo projects and automated deployments are suggested to enable continuous deployment with Git.
Git
GitMayank Patel Covered:
What is Git?
Why Git?
Git Security
Features
Tooling
JIRA Integration
CI
Git Workflows
Git Training
Glossary
Branching and Release Strategy
40 square's git workflow
40 square's git workflowRuben Tan This document summarizes a software company's migration from Mercurial to Git for source control and their new workflow using Git. They implemented Vincent Driessen's branching model with long-running branches for master, staging, and development. Developers work in their own forks, rebase regularly, and submit pull requests to integrators for review and merging into staging or development. This standardized process aims to reduce merge conflicts and enable predictable integration and deployment between branches.
Continuous delivery with open source tools
Continuous delivery with open source toolsSebastian Helzle These slides are about my personal experience from creating a continuous delivery process in the last 2 years.
The main focus lies in the tools I used and my experience with them.
Introduction to Git for developers
Introduction to Git for developersDmitry Guyvoronsky The document provides a brief history of revision control systems including SCCS, RCS, CVS, Subversion, and distributed systems like Git, Mercurial, and Bazaar. It discusses the problems with earlier systems that motivated the creation of Git, including issues with CVS and Subversion. It describes how Linus Torvalds created Git to address these problems and support fast, distributed, and non-linear development workflows.
Enterprise git
Enterprise gitPedro Melo The document discusses why Git is a useful version control system. It notes that Git is fast, secure, distributed, and cross-platform. It works well for both large and small teams. The document outlines some common branch naming conventions like using "master" for production, "release/*" for releases, and "feature/*" for new features. It recommends starting with best practices and choosing whatever source control works for your team.
Working with Git
Working with GitTony Hillerson Tony Hillerson's presentation covered various aspects of working with Git for Android developers. It discussed configuring Git, examining the Git database, working with multiple repositories using SSH, submodules, and subtrees. It also covered advanced Git querying, and using Git Flow conventions for managing releases. The presentation provided examples and tips for common Git tasks and questions developers may encounter.
Ad
More Related Content
What's hot (20)
CI is dead, long live CI
CI is dead, long live CIFrédéric Lepied This document discusses different types of continuous integration (CI) pipelines. It begins by describing staging CI, where jobs are triggered on new commits, and issues can arise if the build breaks. It then covers gating CI, used by OpenStack, where code is reviewed and tested before being merged without broken builds. Finally, it discusses doing CI yourself using open source tools like Gerrit, Zuul and Jenkins, alone or via the pre-built Software Factory project. The conclusion is that gating CI prevents broken masters and these techniques can be reused for one's own projects.
How We Use GitHub
How We Use GitHubNYC DevShop In a community setting here at WeWork Labs in NYC, Kevin McNamee, our lead developer, presented an introductory course on adding git best practices to your team's dev workflow.
Master Continuous Delivery with CloudBees Jenkins Platform
Master Continuous Delivery with CloudBees Jenkins Platformdcjuengst This document discusses the CloudBees Jenkins Platform for continuous delivery. It begins by outlining challenges that organizations face as their use of open source Jenkins grows. It then introduces the CloudBees Jenkins Platform as an enterprise-grade solution for Jenkins that provides features like high availability, security, scalability, and expert support. The document explores various components of the CloudBees Jenkins Platform, including CloudBees Jenkins Enterprise, support for cloud and containers, continuous delivery capabilities, and tools for monitoring and management at scale.
Git 101 - Crash Course in Version Control using Git
Git 101 - Crash Course in Version Control using GitGeoff Hoffman Find out why more and more developers are switching to Git - distributed version control. This intro to Git covers the basics, from cloning to pushing for beginners.
Code review vs pull request
Code review vs pull requestBryan Liu This document discusses code reviews and pull requests/merge requests. It notes that large diffs are difficult to review due to issues spotting bugs and reverting or merging changes. It recommends avoiding overloading or overcrowding reviews by keeping changes concise, contained, and guided. The document describes an Arc workflow for code reviews using Phabricator and compares post-push audits to pre-push reviews. It also discusses benefits of rebasing vs merging and integrating Phabricator with Jenkins.
Bitbucket git-bamboo-jira
Bitbucket git-bamboo-jiralenamattt The document provides information about version control systems like Git and tools from Atlassian like Bitbucket, Bamboo, and Jira. It discusses how Git is used to manage source code changes over time. It also explains how to install and configure Git, and commonly used Git commands. The document then describes how Bitbucket can be used as a code repository and linked to Jira for issue tracking. Bamboo is introduced as a tool for continuous integration and deployment that can be linked to Bitbucket and Jira as well. Steps for installing and configuring Bamboo pipelines are also outlined.
Up GitLab Presentation 2015
Up GitLab Presentation 2015Kumaran Balachandran This presentation from the University of Portland covers using GitLab for version control. It discusses creating a GitLab account, making a new project, and using GitLab on both Windows and Linux. On Windows, users can install GitHub desktop and drag project URLs to clone repositories. On Linux, commands like git clone, git add, and git push are used to clone repositories from GitLab and push new files. The presentation provides several online resources for learning more about Git and GitLab.
Trunk-Based Development
Trunk-Based DevelopmentBryan Liu What's TBD, some facts and how TBD with feature toggle can increase release frequency, lower release risk, decouple release from code deployment. DevOpsDays, Taipei, 2017
Git best practices workshop
Git best practices workshopOtto Kekäläinen The document discusses best practices for using Git including basic commands, branches, tags, and collaboration using GitHub. It covers Git fundamentals like committing, pushing, pulling and branching as well as more advanced topics such as rebasing, cherry-picking, stashing and using Git hooks for continuous integration. The presentation aims to help users learn to use Git more efficiently.
GitLab 8.5 Highlights and Step-by-step tutorial
GitLab 8.5 Highlights and Step-by-step tutorialHeather McNamee In this webcast, learn how to collaborate with GitLab. You'll see new features from GitLab 8.5 in practice. Check out our blog for more information. https://about.gitlab.com/2016/02/26/webcast-wrapup/
A painless self-hosted Git service: Gitea
A painless self-hosted Git service: GiteaBo-Yi Wu Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab. The initial development have been done on Gogs but we have forked it and named it Gitea. If you want to read more about the reasons why we have done that please read this blog post.
https://docs.gitea.io/en-us/
Why you can't ignore GitLab
Why you can't ignore GitLabPivorak MeetUp GitLab is an opinionated and integrated set of tools based on convention over configuration that offers a superior user experience. It provides features like continuous integration, static site generation, issue tracking, code review and more. The document encourages using GitLab.com for free private repositories or self-hosting. Contributing to GitLab's open source project is also presented as a way to get feedback, build your resume and potentially get a job there. The architecture follows an MVC pattern with services and finders to power its functionality.
Webinar - Continuous Integration with GitLab
Webinar - Continuous Integration with GitLabOlinData The document is a presentation about continuous integration with GitLab. It discusses what continuous integration is, why it is important, and how to set up continuous integration builds using GitLab. Specifically, it defines continuous integration as integrating code regularly to prevent problems and identify issues early. It recommends gradually adopting continuous integration practices like writing test cases whenever bugs are fixed. The presentation also provides instructions on setting up a GitLab runner to enable continuous integration builds and adding a .gitlab-ci.yml file to configure builds.
Introducing GitLab (June 2018)
Introducing GitLab (June 2018)Noa Harel This document provides an overview and agenda for introducing GitLab tools. It discusses trends in modern development like increased use of open source tools and continuous integration/deployment. GitLab is presented as a one platform solution that provides version control, issue tracking, code review, CI/CD pipelines, and other DevOps tools. Key benefits of GitLab like open source contributions and frequent releases are outlined. Upcoming features in GitLab 11 like CI pipelines in the web IDE and license management are previewed. The presentation concludes with a Q&A and information on how to get a GitLab cheat sheet.
Git Flow and JavaScript Coding Style
Git Flow and JavaScript Coding StyleBo-Yi Wu Git Flow and Coding Style discusses Git merge vs Git rebase and JavaScript coding style. It explains how Git merge creates a new commit when merging branches while Git rebase replays commits from one branch onto another branch without creating additional merge commits. It recommends rebasing the master branch and testing before creating a pull request. It also discusses the Airbnb JavaScript style guide as a good reference for code examples and styles including ES6 standards. Yoda conditions are mentioned as a style to avoid assignment errors in conditional statements. Writing unit tests is suggested to prevent coding errors.
Git in Continuous Deployment
Git in Continuous DeploymentBrett Child The document discusses using Git and continuous deployment workflows. It proposes a development model using Git branching where developers work on feature branches off a development branch. When a feature is ready, it is merged into development and then propagated to test and production branches. This allows code to be deployed frequently while separating stable and unstable code. Challenges with other version control systems like SVN are noted. Tools like scripts for multi-repo projects and automated deployments are suggested to enable continuous deployment with Git.
Git
GitMayank Patel Covered:
What is Git?
Why Git?
Git Security
Features
Tooling
JIRA Integration
CI
Git Workflows
Git Training
Glossary
Branching and Release Strategy
40 square's git workflow
40 square's git workflowRuben Tan This document summarizes a software company's migration from Mercurial to Git for source control and their new workflow using Git. They implemented Vincent Driessen's branching model with long-running branches for master, staging, and development. Developers work in their own forks, rebase regularly, and submit pull requests to integrators for review and merging into staging or development. This standardized process aims to reduce merge conflicts and enable predictable integration and deployment between branches.
Continuous delivery with open source tools
Continuous delivery with open source toolsSebastian Helzle These slides are about my personal experience from creating a continuous delivery process in the last 2 years.
The main focus lies in the tools I used and my experience with them.
Introduction to Git for developers
Introduction to Git for developersDmitry Guyvoronsky The document provides a brief history of revision control systems including SCCS, RCS, CVS, Subversion, and distributed systems like Git, Mercurial, and Bazaar. It discusses the problems with earlier systems that motivated the creation of Git, including issues with CVS and Subversion. It describes how Linus Torvalds created Git to address these problems and support fast, distributed, and non-linear development workflows.
Similar to Git branching-model (20)
Enterprise git
Enterprise gitPedro Melo The document discusses why Git is a useful version control system. It notes that Git is fast, secure, distributed, and cross-platform. It works well for both large and small teams. The document outlines some common branch naming conventions like using "master" for production, "release/*" for releases, and "feature/*" for new features. It recommends starting with best practices and choosing whatever source control works for your team.
Working with Git
Working with GitTony Hillerson Tony Hillerson's presentation covered various aspects of working with Git for Android developers. It discussed configuring Git, examining the Git database, working with multiple repositories using SSH, submodules, and subtrees. It also covered advanced Git querying, and using Git Flow conventions for managing releases. The presentation provided examples and tips for common Git tasks and questions developers may encounter.
Make Your Team Flow
Make Your Team FlowChad Moone The iOS team at The Washington Post needed to grow quickly and maintain sanity (and shipping quality). Here are some of the key workflow tools that we used.
Git for folk who like GUIs
Git for folk who like GUIsTim Osborn Slides from a lightning talk at WordPress Melbourne User Group. The business end was a simple demonstration of SourceTree, no commandline :)
COSCUP 開源工作坊：Git workflows
COSCUP 開源工作坊：Git workflowsCarl Su 日益複雜的程式碼，您的團隊如何應對？若您具備 Git 基礎，來參加就對了！
從需求到實作，從測試到上線。本工作坊將針對數種情境，帶您動手實際演練。
活動結束後，可以設計出適合自己的 Git 流程，降低溝通、開發和部署成本。
http://coscup2015.kktix.cc/events/h4-gitlab-flow
Git basics, Team Workflows (Ciro Miranda)
Git basics, Team Workflows (Ciro Miranda)Ciro Miranda The document discusses different version control workflows including local, centralized, and distributed systems. It focuses on Git and describes common Git commands like clone, status, add, commit, pull and push. Different Git workflows for teams are presented, including feature branches to isolate work and release branches to integrate completed features. The Git Flow model is described using main branches for production (master) and integration (develop), plus branches for features, releases and hotfixes.
.Git for WordPress Developers
.Git for WordPress Developersmpvanwinkle This document discusses version control and Git. It explains that version control allows developers to maintain stability and continuity in websites/applications by saving versions. Git tracks differences between commits, is distributed for less server overhead, and makes complex workflows easier to manage. The document provides examples of basic Git commands and realistic workflows for development, deployment, using branches, merging, and other "cool stuff" like hooks, stash, and reset. Resources are also included for learning more about Git vs Subversion and deploying with Git.
Session: Git Basics & GitFlow Workflow
Session: Git Basics & GitFlow WorkflowMidhun Mohanan This document provides an overview and summary of a session on Git basics and workflow:
- The session plan outlines basics of version control, introduction to centralized and distributed version control systems, basics of Git, and introduction to Gitflow workflow.
- It discusses why version control is needed and describes local, centralized, and distributed version control systems such as Subversion and Git.
- Key Git concepts are defined including repository, cloning, adding, committing, pushing, pulling, merging, branches, and tags.
- Finally, the Gitflow workflow is presented, outlining main and supporting branches including features, releases, hotfixes and their naming conventions.
How bigtop leveraged docker for build automation and one click hadoop provis...
How bigtop leveraged docker for build automation and one click hadoop provis...Evans Ye What is Apache Bigtop?
Achieving Build Automation
One-Click Hadoop Provisioning
Bigtop at Trend Micro
git Technologies
git TechnologiesHirantha Pradeep Git is a distributed version control system developed by Linus Torvalds for Linux kernel development. The presentation discusses various Git concepts and workflows including commands like git init, git clone, git add, git commit, and git push. It covers workflows like centralized, feature branch, and Gitflow along with hooks and GitHub features like pull requests and gists.
Git branching
Git branchingiCapps This presentation covers a (short) walkthrough on Git branching. Local branches, remote branches, pull requests and the popular "Gitflow" branching model were discussed. However, a big part of the presentation was covered in a live demo, causing those topics not to be included in the slides.
CREDITS: Most images in the slides are from this blog post by Vincent Driessen: http://nvie.com/posts/a-successful-git-branching-model/.
Git
GitDaniel Kummer This document provides an overview of Git and compares its project structure, branching, merging, tagging, and other features to Subversion (SVN). It notes that Git uses a single working directory instead of separate directories for branches like SVN. It outlines how Git handles operations like cloning repositories, branching, merging, tagging, and pushing/pulling changes. The document also discusses common Git commands and how to get help. It includes sections on branching strategies for development, release, and hotfix branches as well as tooling options for Git on the command line, OSX, Windows, and within IDEs like Eclipse and IntelliJ.
Git'in on Windows
Git'in on WindowsStacy Vicknair This speech aims to provide the basics of git, integrating with GitHub and TFS on the Windows platform.
Dev, Staging & Production Workflow with Gitify (at MODXpo 2015 in Munich)
Dev, Staging & Production Workflow with Gitify (at MODXpo 2015 in Munich)Mark Hamstra Introducing the Gitify workflow toolkit for MODX, talking about the different needs for workflow solutions, specific to the MODX CMS.
Distributed Versioning Tools, BeJUG 2010
Distributed Versioning Tools, BeJUG 2010Pursuit Consulting These are the slides Louis Jacomet and myself (Jo Voordeckers) used in our presentation at BeJUG 2010-10-20
Magento 2 Workflows
Magento 2 WorkflowsRyan Street This document outlines workflows and tools for managing Magento 2 development. It discusses challenges with scalable and complicated processes and assumptions of skill. Lessons learned include keeping developer freedom and code integrity while maintaining accountability. Recommended tools include Vagrant for simplified developer setups, PHPStorm for code completion and testing, Git for version control, and Composer for dependencies. The workflow uses separate modules in a Git repository structure with branches for different environments and deployment automation.
HelloGit
HelloGitJason Hanson The Gitflow workflow model provides a robust branching strategy for managing larger projects with multiple concurrent releases and features. It uses branches for features, releases, and hotfixes, with develop and master branches. Features are developed on feature branches off develop, releases are prepared on release branches off develop, and hotfixes are directly patched onto master.
Git'in in 15
Git'in in 15Stacy Vicknair The document introduces distributed version control and Git on the Microsoft platform. It discusses the differences between centralized and distributed version control systems, provides an overview of Git's functionality, and lists resources for downloading Git and learning Git commands on Windows, including links to Git for Windows and Git extensions for Powershell.
Hacking on WildFly 9
Hacking on WildFly 9Virtual JBoss User Group Join us for this interactive event and get your hands dirty with some WildFly 9 hacking!
Our host Kabir Khan will explain how you can contribute to the WildFly project at many different levels, from properly reporting bugs in the forums and issue tracker, to actually being able to submit a pull request.
During this interactive event you will have a chance to play with WildFly 9 and try some of the following:
• Find a JIRA you want to work on.
• See how to check-out the code and setup your IDE.
• Build WildFly
• Code walkthrough - code organisation, jboss-modules etc.
• Debug something from a stack trace in a JIRA issue to nail down the problem.
• Try the testsuite
• And more!
WordPress Under Control (Boston WP Meetup)
WordPress Under Control (Boston WP Meetup)Matt Bernhardt This was a presentation I gave at the Boston WordPress Meetup on October 30, 2017. It focuses on a set of development tools that we have used at the MIT Libraries that includes Waffle.io, Travis, and CodeClimate. I also discuss some alternatives that we tried, and some thoughts on replacements for aspects of this approach.
Ad
More from Aaron Huang (7)
Dollar symbol
Dollar symbolAaron Huang The document discusses the history and evolution of jQuery, including major releases and changes over time. It describes how jQuery moved from a concatenated file structure to using RequireJS and module dependencies. It also covers changes in licensing between versions. Finally, it provides examples of how jQuery handles different selector types and error checks selector input.
Readability
ReadabilityAaron Huang The document describes the process for summarizing articles using a readability algorithm. It involves:
1. Removing JavaScript and CSS, and filtering out unnecessary nodes based on regex rules.
2. Calculating a score for each node based on tag names, IDs, classes and other attributes.
3. Adjusting scores based on things like number of commas, text length, and transferring scores to parent nodes.
4. Adjusting final candidate scores based on link density, where good content should have less than 5% of text in links.
5. Selecting the top candidate and related sibling nodes as the summary.
Ad
Recently uploaded (20)
#AdminHour presents: Hour of Code2018 slide deck from 12/6/2018
#AdminHour presents: Hour of Code2018 slide deck from 12/6/2018Lynda Kane Slide Deck from the #AdminHour's Hour of Code session on 12/6/2018 that features learning to code using the Python Turtle library to create snowflakes
TrustArc Webinar: Consumer Expectations vs Corporate Realities on Data Broker...
TrustArc Webinar: Consumer Expectations vs Corporate Realities on Data Broker...TrustArc Most consumers believe they’re making informed decisions about their personal data—adjusting privacy settings, blocking trackers, and opting out where they can. However, our new research reveals that while awareness is high, taking meaningful action is still lacking. On the corporate side, many organizations report strong policies for managing third-party data and consumer consent yet fall short when it comes to consistency, accountability and transparency.
This session will explore the research findings from TrustArc’s Privacy Pulse Survey, examining consumer attitudes toward personal data collection and practical suggestions for corporate practices around purchasing third-party data.
Attendees will learn:
- Consumer awareness around data brokers and what consumers are doing to limit data collection
- How businesses assess third-party vendors and their consent management operations
- Where business preparedness needs improvement
- What these trends mean for the future of privacy governance and public trust
This discussion is essential for privacy, risk, and compliance professionals who want to ground their strategies in current data and prepare for what’s next in the privacy landscape.
"Rebranding for Growth", Anna Velykoivanenko
"Rebranding for Growth", Anna VelykoivanenkoFwdays Since there is no single formula for rebranding, this presentation will explore best practices for aligning business strategy and communication to achieve business goals.
Linux Professional Institute LPIC-1 Exam.pdf
Linux Professional Institute LPIC-1 Exam.pdfRHCSA Guru Introduction to LPIC-1 Exam - overview, exam details, price and job opportunities
Dev Dives: Automate and orchestrate your processes with UiPath Maestro
Dev Dives: Automate and orchestrate your processes with UiPath MaestroUiPathCommunity This session is designed to equip developers with the skills needed to build mission-critical, end-to-end processes that seamlessly orchestrate agents, people, and robots.
📕 Here's what you can expect:
- Modeling: Build end-to-end processes using BPMN.
- Implementing: Integrate agentic tasks, RPA, APIs, and advanced decisioning into processes.
- Operating: Control process instances with rewind, replay, pause, and stop functions.
- Monitoring: Use dashboards and embedded analytics for real-time insights into process instances.
This webinar is a must-attend for developers looking to enhance their agentic automation skills and orchestrate robust, mission-critical processes.
👨🏫 Speaker:
Andrei Vintila, Principal Product Manager @UiPath
This session streamed live on April 29, 2025, 16:00 CET.
Check out all our upcoming Dev Dives sessions at https://community.uipath.com/dev-dives-automation-developer-2025/.
Rusty Waters: Elevating Lakehouses Beyond Spark
Rusty Waters: Elevating Lakehouses Beyond Sparkcarlyakerly1 Spark is a powerhouse for large datasets, but when it comes to smaller data workloads, its overhead can sometimes slow things down. What if you could achieve high performance and efficiency without the need for Spark?
At S&P Global Commodity Insights, having a complete view of global energy and commodities markets enables customers to make data-driven decisions with confidence and create long-term, sustainable value. 🌍
Explore delta-rs + CDC and how these open-source innovations power lightweight, high-performance data applications beyond Spark! 🚀
tecnologias de las primeras civilizaciones.pdf
tecnologias de las primeras civilizaciones.pdffjgm517 descaripcion detallada del avance de las tecnologias en mesopotamia, egipto, roma y grecia.
Semantic Cultivators : The Critical Future Role to Enable AI
Semantic Cultivators : The Critical Future Role to Enable AIartmondano By 2026, AI agents will consume 10x more enterprise data than humans, but with none of the contextual understanding that prevents catastrophic misinterpretations.
Role of Data Annotation Services in AI-Powered Manufacturing
Role of Data Annotation Services in AI-Powered ManufacturingAndrew Leo From predictive maintenance to robotic automation, AI is driving the future of manufacturing. But without high-quality annotated data, even the smartest models fall short.
Discover how data annotation services are powering accuracy, safety, and efficiency in AI-driven manufacturing systems.
Precision in data labeling = Precision on the production floor.
Technology Trends in 2025: AI and Big Data Analytics
Technology Trends in 2025: AI and Big Data AnalyticsInData Labs At InData Labs, we have been keeping an ear to the ground, looking out for AI-enabled digital transformation trends coming our way in 2025. Our report will provide a look into the technology landscape of the future, including:
-Artificial Intelligence Market Overview
-Strategies for AI Adoption in 2025
-Anticipated drivers of AI adoption and transformative technologies
-Benefits of AI and Big data for your business
-Tips on how to prepare your business for innovation
-AI and data privacy: Strategies for securing data privacy in AI models, etc.
Download your free copy nowand implement the key findings to improve your business.
AI EngineHost Review: Revolutionary USA Datacenter-Based Hosting with NVIDIA ...
AI EngineHost Review: Revolutionary USA Datacenter-Based Hosting with NVIDIA ...SOFTTECHHUB I started my online journey with several hosting services before stumbling upon Ai EngineHost. At first, the idea of paying one fee and getting lifetime access seemed too good to pass up. The platform is built on reliable US-based servers, ensuring your projects run at high speeds and remain safe. Let me take you step by step through its benefits and features as I explain why this hosting solution is a perfect fit for digital entrepreneurs.
Big Data Analytics Quick Research Guide by Arthur Morgan
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.
Buckeye Dreamin' 2023: De-fogging Debug Logs
Buckeye Dreamin' 2023: De-fogging Debug LogsLynda Kane Slide Deck from Buckeye Dreamin' 2023: De-fogging Debug Logs which went over how to capture and read Salesforce Debug Logs
"Client Partnership — the Path to Exponential Growth for Companies Sized 50-5...
"Client Partnership — the Path to Exponential Growth for Companies Sized 50-5...Fwdays Why the "more leads, more sales" approach is not a silver bullet for a company.
Common symptoms of an ineffective Client Partnership (CP).
Key reasons why CP fails.
Step-by-step roadmap for building this function (processes, roles, metrics).
Business outcomes of CP implementation based on examples of companies sized 50-500.
Buckeye Dreamin 2024: Assessing and Resolving Technical Debt
Buckeye Dreamin 2024: Assessing and Resolving Technical DebtLynda Kane Slide Deck from Buckeye Dreamin' 2024 presentation Assessing and Resolving Technical Debt. Focused on identifying technical debt in Salesforce and working towards resolving it.
Manifest Pre-Seed Update | A Humanoid OEM Deeptech In France
Manifest Pre-Seed Update | A Humanoid OEM Deeptech In Francechb3 The latest updates on Manifest's pre-seed stage progress.
Hands On: Create a Lightning Aura Component with force:RecordData
Hands On: Create a Lightning Aura Component with force:RecordDataLynda Kane Slide Deck from the 3/26/2020 virtual meeting of the Cleveland Developer Group presentation on creating a Lightning Aura Component using force:RecordData.
Cyber Awareness overview for 2025 month of security
Cyber Awareness overview for 2025 month of securityriccardosl1 Cyber awareness training educates employees on risk associated with internet and malicious emails
Git branching-model
- 1. Git Branching Model Aaron Huang ＠aar0ntw
- 2. via Vincent Driessen at http://nvie.com
- 3. Why Git ?
- 7. Lock
- 8. Merge
- 9. Pull
- 10. Review & Accept
- 11. via Vincent Driessen at http://nvie.com
- 12. Main Branches
- 13. Main Branches
- 14. Main Branches • Master
- 15. Main Branches • Master • Develop
- 16. Main Branches • Master • Develop
- 17. Main Branches • Master • Develop
- 18. Support Branches
- 19. Support Branches • Feature
- 20. Support Branches • Feature • Release
- 21. Support Branches • Feature • Release • Hotfix
- 22. Support Branches • Feature • Release • Hotfix
- 23. Support Branches • Feature • Release • Hotfix
- 24. Support Branches • Feature • Release • Hotfix
- 25. Support Branches • Feature • Release • Hotfix
- 26. Feature
- 27. Feature
- 28. Release
- 29. Hotfix
- 30. Tools https://github.com/nvie/gitflow MacOSX: brew install git-flow Windows: contribmsysgit-install.cmd Linux: apt-get install git-flow
- 31. Sources • A successful Git branching model • https://github.com/nvie/gitflow • http://code.google.com/p/gerrit/ • Agile, the next generation: Three ways to go beyond Scrum
- 32. End