Comments (1)
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)
- Gitless follows symbolic links HOT 1
- Modification to fit some workflow
- Request: tab completion
- Gitless Guide (simplified)
- Comparison between this and other similar products HOT 4
- track doesn't override .gitignore HOT 2
- "failed to remove" error leads to lost untracked and ignored files? HOT 1
- gl commit: use commit.template
- gl commit: no option -s to sign-off
- gl commit: not verified HOT 3
- gl commit -p: quiting with 'q' opens editor with commit message
- gl diff: not working with diff-so-fancy or delta HOT 1
- Replace travis with github actions
- gitless crashes on commit HOT 1
- `gl switch` takes 10+ seconds HOT 1
- Is this project abandoned? HOT 9
- ui: info about untracked files should only display if untracked files exist.
- how to diff two branches
- Extension Update
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
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.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from gitless.