Skip to content
Snippets Groups Projects

Allow merge conflict resolution on failed cherry-pick

    • Open Issue created by Eldridge Henley @ehenley

    Problem to solve

    When a user has a cherry-pick fail due to a merge conflict, they are only shown an error and not given the ability to resolve the conflict in the UI. With merge requests, due do have a limited ability to resolve conflicts.

    Intended users

    User experience goal

    The user is offered a quick resolution in the UI to resolve cherry-pick conflicts.

    Proposal

    When a user creates cherry-pick that results in a conflict, the user should have the ability to resolve the conflict in the UI.

    Further details

    The greatest benefit for the user is that they will be able to quickly resolve cherry-pick conflicts in the UI and not have to manually fix the conflict from a git terminal.

    Documentation

    Documentation would need to be modified to show users how to resolve cherry-pick conflicts in the UI. https://docs.gitlab.com/ee/user/project/merge_requests/resolve_conflicts.html

    Availability & Testing

    What does success look like, and how can we measure that?

    Users are able to resolve cherry-pick conflicts in the UI.

    What is the type of buyer?

    buyer: Alex
    tier: core/free

    Links / references

    Internal Zendesk Ticket

    Designs

      Child items ...

      2. Activity

      Please register or sign in to reply