Git Product home page Git Product logo

Comments (1)

spderosso avatar spderosso commented on July 29, 2024

try doing gl resolve path where path is the one corresponding to AssemblyInfo.cs---this might fix the error and you might be able to complete the fuse without switching to git.

If that doesn't work, you can (1) copy the files you resolved outside of the repo so that you don't loose the changes you've made and (2) abort the fuse, which will put you back to the state in which you were before you started the fuse. Then you can use git to pull the changes from origin/master, copy over the files you resolved, git add them to mark them as resolved and git rebase --continue.

Let me know if you managed to resolve the issue or if you have any other questions.

from gitless.

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.