Coder Social home page Coder Social logo

Comments (2)

daneah avatar daneah commented on June 7, 2024

Some inspiration from Django

from pharos.

daneah avatar daneah commented on June 7, 2024

As an anecdote, we took the approach of keeping a long-running release/14.0.0 branch going to allow develop to continue getting non-breaking features, and merging breaking features into the release branch. This worked okay, but with a few impacts:

  • We would forget to merge develop into the release branch regularly, creating hairy merge conflicts
    • The release branch is in general divergent from develop, so we get more merge conflicts no matter what we do
  • Atlassian Changesets seems to read commit authors rather than looking at PR authors, and because we squash commits it looked like @brentswisher had done all the work when it came time to release after merging release/14.0.0 into develop.

from pharos.

Related Issues (20)

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.