Giter VIP home page Giter VIP logo

branching-strategy's Introduction

Branching strategy and race condition

This is a simple example of two health branches auto merged one branch with no conflict but breaks logic. the two branches Image

##Developers have different ideas/implementations that can conflict.

Repo can force branch "linear history", it forces conflicts resolved before merge into branch, but it's not practical:

  1. Usually there is not many conflicts, it's frustrated for devs to pull rebase all the time.
  2. Make people race to merge: merge/push 1st and let others resolve the conflicts ....

Enable auto merge and let branch strategy and auto tests should catch it as early as possible.

The simple better solution for this example is to run tests after merged. But tests take hours to finish, have to balance between quality and productivity.

When conflict detected by auto tests on H:

              E---F---G  topicA
             /         \
A--B--[C]---D---- H----[I]---
        \        /
         J--K--L        topicB

Last test success on C, and failed on I, run test on: H success / \ G F

run test on: H failure /
L K

branching-strategy's People

Contributors

gyang-vonage avatar garyy7811 avatar

Watchers

 avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.