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

cli: Add prev/next --conflict, which allows you to jump to the next conflict. #3248

Merged
merged 2 commits into from
Jun 20, 2024
Merged

cli: Add prev/next --conflict, which allows you to jump to the next conflict. #3248

merged 2 commits into from
Jun 20, 2024

Commits on Jun 20, 2024

  1. lib: Add RevsetExpression::filtered(). 

    This allows users to easily filter a commit range by conflicts, which will be needed for `next/prev`
further down in the next commit. Users which benefit from it were also migrated.
    @PhilipMetzger
    PhilipMetzger committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    59150a0 View commit details
    Browse the repository at this point in the history

  2. next/prev: Implement next/prev --conflict 

    This allows users to jump to the next conflict in the ancestors or children of 
the start commit.

Continues work on #2126

Co-Authored-By: Noah Mayr <dev@noahmayr.com>
    @PhilipMetzger @noahmayr
    PhilipMetzger and noahmayr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    02021e9 View commit details
    Browse the repository at this point in the history