gitbuster

gitbuster copied to clipboard

Crash while stashing in the middle of a conflict

4

I just tried to rebase a git tree onto another remote, and of course got conflicts. This is what git says: ``` bash $ git status # Not currently on...

feth

mike-perdide

Gitbuster special mode doesn't work after git pull --rebase conflicts

1

mike-perdide

This error message should be emitted in gitbuster/**init**.py.

mike-perdide

New feature: merge one branch onto another

2

mike-perdide

a --help option

2

mike-perdide

mike-perdide

reload automatically, whenever possible, if anything changes in the repository (eg. I made a git pull --rebase manually).

mike-perdide

This can be done using: QTableView.setGridStyle (self, Qt.PenStyle style)

mike-perdide

The simple output of "git log commitA..commitB" could suffice for now.

mike-perdide