Comments (4)
I have a rebase-apply dir in .git but no rebase-merge dir in my .git directory.
from gitbuster.
This looks like a GitPython bug. I'll look into it but I think the best thing to do is wait for the new pygit2/gfbi_core version.
from gitbuster.
Then I add the "3rd party" tag.
from gitbuster.
I also crashed after clicking [yes] when in a conflict.
TypeError: HEAD is a detached symbolic reference as it points to '4c85c7c0978485c40874d51f980f3dcdbf561b7e'
stash -> git.exc.GitCommandError: 'git stash' returned exit status 1: monologue/core.py: unmerged (a1e11abe63f253e6a1945887115dbd9d1d02f5e4)
from gitbuster.
Related Issues (20)
- The conflicting commit should be more obvious HOT 1
- Be able to display similar commits from one commit
- Be able to display common commits between two branches HOT 1
- Using the gitbuster special conflict mode shoud be a noop when canceled
- resizeColumnToContents() is nice, but seems expensive HOT 2
- The grid should be thicker
- We should validate the name every time we pop the new branch name dialog
- Be able to "cherry-pick" merges. HOT 3
- New feature: merge one branch onto another HOT 2
- Be able to edit the message field from the rebase tab
- We should have some access to the content of a commit
- Watching repository changes and be able to reload
- Refuse to apply when the current state of the repository has changed HOT 1
- a --help option HOT 2
- Test that gfbi_core is correctly checked out in the Makefile
- pip installation doesn't work HOT 3
- Display a nice error when PyQt4 isn't found
- Gitbuster special mode doesn't work after git pull --rebase conflicts HOT 1
- Packaging debian
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 gitbuster.