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

Support Rebase #113

Closed
3 tasks
hdpoliveira opened this issue Jul 3, 2020 · 0 comments
Closed
3 tasks

Support Rebase #113

hdpoliveira opened this issue Jul 3, 2020 · 0 comments
Assignees

Comments

@hdpoliveira
Copy link
Collaborator

hdpoliveira commented Jul 3, 2020

https://www.mercurial-scm.org/wiki/RebaseExtension

Proposal: three commands in the palette:

  • Rebase current branch
  • Rebase: Abort
  • Rebase: Continue

'Rebase current branch' will display a QuickPick for the destination (-d option), the same as the one used for 'Update to...'. Under the hood, we'll run 'hg rebase -b . -d ${destinationPicked}'
If a conflict happens, we will open the SCM view, and open the first conflicted file in the editor.
The user will be able to run 'Rebase: Continue' if all conflicts have been resolved, or 'Rebase: Abort' to drop the rebase operation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant