Giter VIP home page Giter VIP logo

Comments (5)

sandlerben avatar sandlerben commented on May 8, 2024

Great question. What I have done, which may not be the best approach, is set two remotes in the downstream project named origin and flask-base. origin points to your project's repository and flask-base points to this repository. This way, you can cherry-pick any flask-base commits you want (just git fetch first).

from flask-base.

sandlerben avatar sandlerben commented on May 8, 2024

Oh, and I don't think submodules is the right solution to the problem. From what I understand, they require that the submodule be kept in a subdirectory. Plus, once you fork off of flask-base, you may make changes which conflict with flask-base changes, or you may not want to include all upstream changes.

from flask-base.

npezolano avatar npezolano commented on May 8, 2024

True, Ideally you want to be able to pull updates from flask-base and not commit to it. Commits for fixes could be sent separately.

from flask-base.

sandlerben avatar sandlerben commented on May 8, 2024

Right. So the workflow could be something like this.

  1. Do work normally using feature branches, pull requests, etc.
  2. Occasionally make a feature branch where you can cherry-pick specific flask-base changes.
  3. Make a pull request for those changes like you normally would.

from flask-base.

abhisuri97 avatar abhisuri97 commented on May 8, 2024

Closing issue. Feel free to reopen/create a new issue if you have further questions.

from flask-base.

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.