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

fix(sync): fix syncing commit stacks built on local main branch #593

Merged
merged 3 commits into from
Oct 13, 2022
Merged

fix(sync): fix syncing commit stacks built on local main branch #593

merged 3 commits into from
Oct 13, 2022

Commits on Oct 13, 2022

  1. refactor(revset): accept slice instead of Vec in resolve_commits

    @arxanas
    arxanas committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    e95716c View commit details
    Browse the repository at this point in the history

  2. feat(sync): changes to sync output when pulling main branch

    @arxanas
    arxanas committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    295d91c View commit details
    Browse the repository at this point in the history

  3. fix(sync): fix syncing commit stacks built on local main branch 

    If the local main branch had local commits (not on the upstream branch) and any descendant (non-main) branches, then we would see the commits shared by both and attempt to rebase them separately. This can work sometimes, but it can also cause problems like rebase cycles or marking public commits as rewritten.
    @arxanas
    arxanas committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    bc420df View commit details
    Browse the repository at this point in the history