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.

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

Add support for rebase #1260

Merged
merged 17 commits into from
Aug 10, 2023
Merged

Conversation

fcollonval
Copy link
Member

This PR

by

  • adding support for rebase:
    • The status of a repository gain a state to notify if a repo is in detached head, merge, cherry-pick or rebase state
    • In case a rebase is in progress, the commit box is replaced by a group button that by default allow to continue (after resolving the conflicts) or optionally skip or abort the rebase.
  • some styling improvement
  • fix checking out from a detached head to another ref

@github-actions
Copy link

github-actions bot commented Aug 9, 2023

Binder 👈 Launch a Binder on branch fcollonval/jupyterlab-git/fix/1217-diff-rebase

@fcollonval fcollonval merged commit c941ee9 into jupyterlab:main Aug 10, 2023
@fcollonval fcollonval deleted the fix/1217-diff-rebase branch August 10, 2023 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

diff file error in conflicted "Error Loading File Diff" after git pull --rebase
1 participant