Coder Social home page Coder Social logo

Comments (3)

jaraco avatar jaraco commented on August 15, 2024

I've drafted a fix (simply replacing the name), but this change creates a merge conflict with every downstream repo and the jaraco.develop known-merge tool doesn't yet support it, so it's going to need more support before it can be merged.

from skeleton.

jaraco avatar jaraco commented on August 15, 2024

Dang. So when these placeholders are in the README, the merge routine works fine to re-substitute the placeholders. But when the conflict is in the pyproject.toml, the routine is unable to load the project metadata because the syntax of that file is broken by the conflict.

And because of the way the merge tool works, the routine is only called after the conflict is already manifest, so there's no great hook point to extract the metadata before the conflict is manifest.

from skeleton.

jaraco avatar jaraco commented on August 15, 2024

Okay. I've worked out the issue with the merge routine and it's now successfully resolving merges that alter lines in substitutions. It should now be possible to apply the change to the skeleton and roll it out across the projects.

from skeleton.

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.