Code Monkey home page Code Monkey logo

Comments (3)

ebkalderon avatar ebkalderon commented on May 12, 2024

@Emilgardis Yes, this is a good point. I think that many of these conflicts arise due to the nested nature of the crates. I don't know of a one size fits all approach to this problem off the top of my head, but I'll definitely think about it. If anyone else has ideas, please share them.

Update: When pulling remote changes to our local machines, we rebase. When merging local changes into the mainline, we merge. Does this sound good?

from amethyst.

Emilgardis avatar Emilgardis commented on May 12, 2024

Yes, that sounds reasonable. Right now we have sync commits on #99 and #81

I'll make a PR to reflect this in CONTRIBUTING.md

from amethyst.

Emilgardis avatar Emilgardis commented on May 12, 2024

21ee399 will in some ways prevent this. Closing issue

from amethyst.

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.