Skip to content
  • Blog
  • Events
  • Help
  • Careers
  • Contact
New Signature
  • About
      • Company

        Cognizant Microsoft Business Group is dedicated to changing the way businesses innovate, transform and run based on a unique cloud operating model. You will now be redirected to our new microsite to learn more.

        View Company

      • Awards

        As a company, we are regularly recognized within the IT industry as well as the communities we serve.

        View All Awards
      • News

        Read the most up-to-date corporate announcements, Microsoft technology updates, innovative business solutions and learn more about how the Cognizant Microsoft Business Group can take your business even farther.

        View News

      • Partners

        New Signature works with a number of outstanding technology companies to deliver the best experiences to our customers.

        View Partners
      • Leadership

        Cognizant Microsoft Business Group’s executive team is comprised of innovative leaders with proven experience and deep industry expertise. You will now be redirected to our new microsite to learn more.

        View Leadership

      • Industries

        Our solutions are tailored to empower organizations across a wide range
        of industries.

        View Industry Experience
    Close
  • Solutions
      • Intelligent Enterprise
        Solutions

        Going Digital
        Unleash cloud capability, deliver change and compete at speed with a Microsoft digital operating model, enabling you to work more efficiently as you transform your IT environment. Learn More

      • Featured Solution

        Secure Cloud
        In a world of constant threat, ensuring that your underlying cloud platform is protected is the first step on your organization’s journey towards a secure, compliant operating environment. Learn More
      • Intelligent Workplace
        Solutions

      • Secure Workplace

        Work Anywhere

        Endpoint Health

        Identity Health

        Teamwork Support



        VIEW WORKPLACE SOLUTIONS
      • Intelligent Cloud
        Solutions

      • App Factory

        Azure Accelerator

        Azure Launchpad

        Azure Launchpad for DevOps

        Application Health

        Platform Health

        VIEW ClOUD SOLUTIONS
    Close
  • Services
      • Begin your journey towards becoming a digital business with GO, our unique end-to-end framework based on the Microsoft Cloud Adoption Framework.

        GO DIGITAL OPERATING MODEL
      • Intelligent Enterprise

      • Consulting

        We go beyond just technology to help your organization understand how digital can help you uniquely differentiate and better serve your employees and customers.

        VIEW ENTERPRISE SERVICES
      • Intelligent Workplace

        • Identity

          Identity is your new first-line-of-defense. It’s vital to your users and clients that your identity platform is properly configured and secured.

          Endpoint

          Whether your devices are on-premises or remote, personal or business-owned, we can ensure they are properly managed and protected.

          Teamwork

          Today’s workforce is collaborating than ever before.  We can empower your current teams with tomorrow’s progressive technologies.

          VIEW WORKPLACE SERVICES
        • Intelligent Cloud

          • Platform

            The cloud is no longer some future-state. It’s the here and now. Adopting a cloud-first platform is one of the best ways to maintain a future-proofed competitive advantage.

            Applications

            We build cloud-native apps and modernize legacy systems with the power of Azure to give your organization a competitive edge.

            Data

            We can help your organization create secure, scalable data platforms to deliver simpler and more sophisticated insights to your business.

            VIEW CLOUD SERVICES
        Close
      • Client Stories
          • Case Studies

            Browse a comprehensive list of companies who have created successful partnerships and experienced transformative solutions with New Signature.

            View All Case Studies

          • Featured Case Study TalkTalk Modern Workplace

            New Signature worked with TalkTalk to define a new Modern Workplace solution based on Microsoft 365, which kept the user firmly at the center of the transformation.
            View Case Study

          • Testimonials

            We love transforming our customers businesses, take a look at what they have to say about New Signature.

            View Testimonials

          • Featured Testimonial Davis Construction

            With New Signature’s help, Davis was able to take a progressive step forward by migrating their private branch exchange (PBX) phone system to a Voice of Internet Protocol (VoIP) system.
            View Testimonial

        Close
      • Explore
          • Guides & Ebooks

            Dive deeper into education with your team by leveraging our expert-developed guides and eBooks.

            View All Guides & Ebooks

          • Infographics

            Rich with statistics and information, our infographics are great tools for quick but insightful learning.

            View All Infographics
          • Podcast: Office Explorers

            Join Kat and Rob monthly as they chat with New Signature experts and explore the world of O365.

            Listen to Podcasts

          • Videos

            Visit our videos stream to access recorded webinars, service information and to learn more about us.

            WATCH ALL VIDEOS
          • Flyers

            Searching for information about our services? Our flyers are a great takeaway for all those details.

            VIEW ALL FLYERS

          • Featured Stream

            Learn more about the tooling and expertise required to unlock productivity and mobilize your teams.

            MODERN WORKPLACE
        Close
        Close
      Blog

      Git Branching Strategies

      New Signature / Blog / Git Branching Strategies
      May 5, 2020April 30, 2020| Chris Ayers

      As a developer, I have felt the pain of long, complex, merges of code, juggling which branch to apply a hotfix, which release is in production and how we can patch it. Do we roll back the code, apply the fix, then roll forward? Or perhaps we make a branch, fix it, then release that?

      While we could do those things in the past, git can take some of the headache out of those scenarios with the right branching strategy. Having a good branching strategy also enables Continuous Integration (CI) and Continuous Delivery (CD). That being said, in general, there is no silver bullet or “right way”. As with software development and architecture, it depends and varies based on your team and your products. Reading about a popular strategy and adopting the most popular or first result can be painful if its not the right fit for your team. New Signature’s expertise in application lifecycle management (ALM) and DevOps can help you find the right strategy for you, minimize the headaches, and enable CI/CD to deliver faster.

      Git Branching

      Branching and merging are essential parts of the daily routine of a developer using Git. While this was something you might fear in the past, with the right strategy, you can get rid of a lot of the headaches. Branches provide teams a way to collaborate on a feature or experiment on something new without impacting everyone.

      Strategies

      There are a few popular git branching strategies out there right now.

      • Git Flow
      • Trunk Based Development (TBD)
      • Github Flow

      Each has its own pros and cons. Some are better based on team size, team experience level, product (desktop, mobile, web), or even organizational structure. There is also an idea in software that has been around since the 1960s– Conway’s Law.

      “Organizations which design systems … are constrained to produce designs which are copies of the communication structures of these organizations.” — M. Conway

      Conway’s Law indicates that the organization can influence your branching strategy where you might end up with long-term environment (dev, qa, prod) or team branches. There are a few competing ideas between the branching strategies. Some strategies push for long-term development branches to isolate code from production,  whileothers try to get code into the production branch as fast as possible to minimize merging. Microsoft does have some guidance on this., but let’s look at the highlights of some of these strategies.

      Git Flow (Feature Based Development)

      Git Flow This is one of the first major branching strategies that gained popularity. Git Flow describes multiple branches for development, releases and the orchestration between them. There are even scripts and extensions provided to help use/maintain Git Flow.

      Pros:

      • Git Flow is used by a lot of distributed, open-source teams that have varying skill levels. The project maintainers can review and approve every line of code going into releases.
      • Git Flow can work well for a traditional release model, where releases are done in terms of months and weeks.
      • Git Flow also works well when dealing with an established product or multiple versions in production.

      Cons:

      • Git Flow can slow things down when having to look at large pull requests if you are trying to iterate quickly.
      • Releases are hard to do more than once a week.
      • Larger features can spend days merging and resolving conflicts (merge hell) and force multiple testing cycles.
      • The Project history is full of merge commits and makes it hard to see the actual work.
      • Can be problematic in Continuous Integration or Continuous Delivery scenarios.

      Trunk-Based Development

      I once heard it explained that “instead of keeping code isolated from other developers you work with, keep your features isolated from your end-users until you’re ready to release them.” Trunk Based Development lets you release more quickly, and encourages feature flag use and automated testing. Branches exist, but they are short lived and small. This minimizes merge conflicts and means smaller code reviews.

      Pros:

      • Allows you to iterate quickly and still maintain quality.
      • Works well with in Continuous Integration or Continuous Delivery scenarios.
      • Can release more often, including multiple times per day.
      • Much tighter feedback loop for developers, business, and end-users.

      Cons:

      • Works best with more experienced developers.
      • Half finished features not properly implemented with feature flags can cause issues.
      • Can cause some issues initially if there isn’t good test coverage or confidence in system stability.

      Github Flow

      Github Flow is very similar to Trunk Based Development with a few major differences. It is a lightweight, branch-based workflow working off the master branch. After the work is ready, a pull request is generated and discussion with team, the branch is deployed to production. Then the code is merged to master. There is a discussion of some of the differences in this Microsoft Build talk.

      Pros:

      • Works well with in Continuous Integration or Continuous Delivery scenarios.
      • Can release often.

      Cons:

      • Releasing from branches and not master.
      • Testing in production.
      • Can run into scaling issues as the team increases.

      One size does not fit all, and while a technique or strategy might work well for one organization, it might not work the best for you. There are other strategies and techniques out there,  Release Flow, Gitlab Flow, and others. Having New Signature’s team work with your business and your developers we can help setup this CI/CD engine that will drive your code into production faster. We can help setup and train your team to use the tools and strategies available to increase productivity, quality, and confidence in your products.

      Categories
      Tips and Tricks
      Contact New Signature

      Blog Posts

      • Agile Delivery for Large Scale Data Ingestion using Azure Data Explorer
      • Implementing Cloud Adoption Framework Across Vida Homeloan’s Organization
      • Cognizant Microsoft Business Group Achieves Microsoft Advanced Specialization for Windows Virtual Desktop
      • Cognizant’s Experience Lab for Continuous Testing with Azure

      Managed Services

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent fermentum, enim ac dignissim aliquet

      VIEW ALL MANAGED SERVICES

      Professional Services

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent fermentum, enim ac dignissim aliquet

      VIEW ALL PROFESSIONAL SERVICES

      New Signature

      About

      • Company
      • Awards
      • News
      • Leadership
      • Partners
      • Industries

      Solutions

      • Intelligent Enterprise Solutions
      • Intelligent Workplace Solutions
      • Intelligent Cloud Solutions

      Services

      • GO
      • Intelligent Enterprise
      • Intelligent Workplace
      • Intelligent Cloud

      Client Stories

      • Client Stories
      • Testimonials

      Explore

      • Guides & Ebooks
      • Podcasts
      • Flyers
      • Infographics
      • Videos
      Copyright © 2023 New Signature
      • Blog
      • Events
      • Careers
      • Help
      • Anti Slavery
      • Privacy Policy
      • Contact
      • About
        • Company
        • Awards
        • News
        • Leadership
        • Partners
        • Industries
      • Services
        • GO
        • Intelligent Enterprise
        • Intelligent Workplace
        • Intelligent Cloud
      • Client Stories
        • Case Studies
        • Testimonials
      • Technologies
      • Explore
        • Guides & Ebooks
        • Infographics
        • Podcast: Office Explorers
        • Videos
        • Flyers
      • Blog
      • Events
      • Careers
      • Contact
      • Search
      Cookie Settings
      New Signature uses "Required Cookies" to run our website, "Functional Cookies" used by third parties to personalise marketing, including social media features.

      Change your preferences by clicking the “Cookie Settings” link at the bottom of every page. Learn more about cookies in our Cookie Policy and our Privacy Policy. By clicking the “Accept Cookies” button below, you consent to our use of cookies.

      Please note that “Required Cookies” will be set regardless of your consent.
      Cookie SettingsAccept Cookies
      Privacy & Cookies Policy

      Privacy Overview

      This website uses cookies to improve your experience while you navigate through the website. Out of these cookies, the cookies that are categorized as necessary are stored on your browser as they are essential for the working of basic functionalities of the website. We also use third-party cookies that help us analyze and understand how you use this website. These cookies will be stored in your browser only with your consent. You also have the option to opt-out of these cookies. But opting out of some of these cookies may have an effect on your browsing experience.
      Performance

      Performance Cookies provide Content Delivery Network assets that deliver faster site content delivery capabilities.

      Required

      These cookies are required mainly in order to deliver Multilanguage site capabilities.

      Functional

      Functional Cookies allow us to provided advanced media capabilities including videos, surveys and other multimedia capabilities.

      Disabling Functional cookies will block the playing of videos and other multimedia site components.

      Targeting

      Targeting Cookies are used to capture user information in order for New Signature to deliver better user experiences.

      Save & Accept