Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When merging or rebasing branches, add the option to interrupt the merge/rebase process with a conflict. #35

Open
rolandkrueger opened this issue Sep 20, 2020 · 0 comments
Open

When merging or rebasing branches, add the option to interrupt the merge/rebase process with a conflict. #35

rolandkrueger opened this issue Sep 20, 2020 · 0 comments

Comments

@rolandkrueger
Copy link
Owner

Just like a real Git repository, in case of a conflict, the repository should be in a MERGING or REBASE state. The current state should be shown in the branch label just like on the command line.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@rolandkrueger