Git Product home page Git Product logo

Comments (3)

realityforge avatar realityforge commented on July 18, 2024

If I understand what you are saying then I think that may be by design. The reason being that if you have braided in a project and modified it locally and then braid update to get remote changes and some of these remote changes conflict with your local changes. How do you manage it? The way braid works now you just manually resolve and commit the changes. If you want a more sophisticated workflow you can always implement this yourself. I don't understand what your proposed solution would be.

from braid.

mattmccutchen avatar mattmccutchen commented on July 18, 2024

I'm talking about the temporary commit, not the actual merge. Sorry, I meant to include the link to make this clearer.

from braid.

realityforge avatar realityforge commented on July 18, 2024

Oh - I see. I have never seen this issue crop up but if you think you can protect this scenario then go for it ;)

from braid.

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.