GithubHelp home page GithubHelp logo

Comments (5)

turbomam avatar turbomam commented on July 30, 2024

Quick note for now:

When I start a backmerge, there's usually about 20 files marked with conflicts by git. Running make squeaky-clean deletes most of them, and they can all be recreated with make squeaky-clean all if I remember.

Same thing for poetry.lock. If there's a conflict, I delete it and hopefully remember to poetry lock before giving myself credit for completing the backmerge.

I started a backmerge yesterday and have pushed it in a state where there's still ~ 6 conflicts in nmdc.yaml.

I think getting to that point was pretty easy, so I could close that PR start over again, going though the whole process with you @eecavanna or @aclum @pkalita-lbl @sierra-moxon @sujaypatil96 @mslarae13.

from nmdc-schema.

turbomam avatar turbomam commented on July 30, 2024

I will fix these missing files now.

from nmdc-schema.

turbomam avatar turbomam commented on July 30, 2024
git add nmdc_schema/*json nmdc_schema/*yaml

The following paths are ignored by one of your .gitignore files:
nmdc_schema/nmdc.schema.json
nmdc_schema/nmdc_materialized_patterns.schema.json
nmdc_schema/nmdc_materialized_patterns.yaml
hint: Use -f if you really want to add them.
hint: Turn this message off by running
hint: "git config advice.addIgnoredFile false"

I'm going to force add them for now, but I guess we should do some .gitignore grooming.

from nmdc-schema.

aclum avatar aclum commented on July 30, 2024

Are there still conflicts in nmdc.yaml? the linked PR indicates not.

from nmdc-schema.

ssarrafan avatar ssarrafan commented on July 30, 2024

It's relatively new comment so I'll move to new sprint. @turbomam let me know if you're not working on this.

from nmdc-schema.

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.