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: conflict on updates to revision #3216

Merged
merged 9 commits into from
Dec 7, 2023
Merged

fix: conflict on updates to revision #3216

merged 9 commits into from
Dec 7, 2023

Commits on Dec 5, 2023

  1. fix: possibly fix conflict on updates to revision 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    b33374a View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. wip 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    b4dd8ff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-r… 

    …evision-update-conflict
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    f619532 View commit details
    Browse the repository at this point in the history

  3. fix one test 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    3dc0d07 View commit details
    Browse the repository at this point in the history

  4. fix tests 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    d78b549 View commit details
    Browse the repository at this point in the history

  5. cleanup 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    99bcbfe View commit details
    Browse the repository at this point in the history

  6. change order 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    dbcb41f View commit details
    Browse the repository at this point in the history

  7. change order to match reality 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    55b127c View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. add comments on exptected actions 

    Signed-off-by: Zach Aller <[email protected]>
    @zachaller
    zachaller committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    6ebd29e View commit details
    Browse the repository at this point in the history