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

Add conflict_resolution input #417

Merged
merged 9 commits into from
May 26, 2024
Merged

Add conflict_resolution input #417

merged 9 commits into from
May 26, 2024

Commits on Mar 31, 2024

  1. backport on conflict - initial commit

    @vermz99
    vermz99 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    87d12e0 View commit details
    Browse the repository at this point in the history

  2. Added unit test for cherry-pick

    @vermz99
    vermz99 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    56b3dd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. refactor for new commit conflict_resolution flag (#12) 

    * changed param name

* refactor for new commit conflict_resolution flag

* refactor for new commit conflict_resolution flag

* Fix unit test

---------

Co-authored-by: Alex Vermette <[email protected]>
    @AlexVermette-Eaton @vermz99
    AlexVermette-Eaton and vermz99 authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1ec3ef4 View commit details
    Browse the repository at this point in the history

  2. dist: build new artifacts 

    Signed-off-by: Alexandre Vermette Lefebvre <[email protected]>
    @AlexVermette-Eaton
    AlexVermette-Eaton committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9a4d5cf View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge remote-tracking branch 'fork/main' - Partial support of remote-… 

    …tracking with backport_on_conflicts
    @AlexVermette-Eaton
    AlexVermette-Eaton committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1614d7d View commit details
    Browse the repository at this point in the history

  2. Added suggestion provided in code review. Added ReadMe. Fixed action.… 

    …yml default value.
    @AlexVermette-Eaton
    AlexVermette-Eaton committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9161072 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Fixed conflit commit message and replaced --force with --force-with-l… 

    …ease
    @AlexVermette-Eaton
    AlexVermette-Eaton committed May 14, 2024
    Configuration menu
    Copy the full SHA
    0b50a9c View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. refactor: make use of default parameter 

    When there is a checkout failure, there was no conflict resolution
applied. The default should be such that we don't have to care about
this parameter.
    @korthout
    korthout committed May 26, 2024
    Configuration menu
    Copy the full SHA
    13c2a2b View commit details
    Browse the repository at this point in the history

  2. dist: build new version

    @korthout
    korthout committed May 26, 2024
    Configuration menu
    Copy the full SHA
    0024721 View commit details
    Browse the repository at this point in the history