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

OSOE-144: Automatic comment on pull requests that have a merge conflict #60

Merged
merged 43 commits into from
Oct 17, 2022
Merged

OSOE-144: Automatic comment on pull requests that have a merge conflict #60

merged 43 commits into from
Oct 17, 2022

Commits on Oct 4, 2022

  1. Add new action

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    cd072ee View commit details
    Browse the repository at this point in the history

  2. Fix

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    d4979d1 View commit details
    Browse the repository at this point in the history

  3. Fixing workflow error.

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    87a12cc View commit details
    Browse the repository at this point in the history

  4. Fixing workflow error.

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    f30d748 View commit details
    Browse the repository at this point in the history

  5. Adding input

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    916ddb4 View commit details
    Browse the repository at this point in the history

  6. Trying out workflow

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    d88e9bd View commit details
    Browse the repository at this point in the history

  7. Moving token

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    1d67005 View commit details
    Browse the repository at this point in the history

  8. Add required prop

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    ed3fdb9 View commit details
    Browse the repository at this point in the history

  9. Change "on"

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    745ba71 View commit details
    Browse the repository at this point in the history

  10. Change text

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    33e8080 View commit details
    Browse the repository at this point in the history

  11. Add doc + merge conflict prep.

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    f24f259 View commit details
    Browse the repository at this point in the history

  12. bump

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    6402f79 View commit details
    Browse the repository at this point in the history

  13. Test empty label

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    7517630 View commit details
    Browse the repository at this point in the history

  14. Adding back label

    Márk Lukovics committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    31594fa View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Adding documentation 

    Changing branch to SHA
    Márk Lukovics committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    c755f2a View commit details
    Browse the repository at this point in the history

  2. Typo

    Márk Lukovics committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    3096dc5 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Improving documentation

    @Luko6
    Luko6 committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    c85e14d View commit details
    Browse the repository at this point in the history

  2. Why are you like this

    @Luko6
    Luko6 committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    da98e42 View commit details
    Browse the repository at this point in the history

  3. Update verify-this-repo.yml

    @Luko6
    Luko6 authored Oct 7, 2022
    Configuration menu
    Copy the full SHA
    e9c7983 View commit details
    Browse the repository at this point in the history

  4. Updating workflow

    @Luko6
    Luko6 committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    20ac259 View commit details
    Browse the repository at this point in the history

  5. Delete check-merge-conflict.yml

    @Luko6
    Luko6 authored Oct 7, 2022
    Configuration menu
    Copy the full SHA
    23a337a View commit details
    Browse the repository at this point in the history

  6. Update verify-submodule-pull-request.yml

    @Luko6
    Luko6 authored Oct 7, 2022
    Configuration menu
    Copy the full SHA
    3457cbe View commit details
    Browse the repository at this point in the history

  7. Merge branch 'issue/OSOE-144' of https://github.com/Lombiq/GitHub-Act… 

    …ions into issue/OSOE-144
    @Luko6
    Luko6 committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    f076fbe View commit details
    Browse the repository at this point in the history

  8. Update build-and-test-orchard-core.yml

    @Luko6
    Luko6 authored Oct 7, 2022
    Configuration menu
    Copy the full SHA
    b0dfe4b View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/dev' into issue/OSOE-144

    @Luko6
    Luko6 committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    759bc7e View commit details
    Browse the repository at this point in the history

  10. Update verify-submodule-pull-request.yml

    @Luko6
    Luko6 authored Oct 7, 2022
    Configuration menu
    Copy the full SHA
    68effc1 View commit details
    Browse the repository at this point in the history

  11. Updating documentation from workflow documentation

    @Luko6
    Luko6 committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    dce2f43 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. Add new reusable workflow

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

  2. Modify workflows

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

  3. Fixing action's name

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

  4. Fixing action

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

  5. Revert "Fixing action" 

    This reverts commit 43b8cf6.
    @Luko6
    Luko6 committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    3c4ef44 View commit details
    Browse the repository at this point in the history

  6. Fixing action

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

  7. Fixing action

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

  8. Move action to correct place

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

  9. Documentation

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

Commits on Oct 14, 2022

  1. Merge remote-tracking branch 'origin/dev' into issue/OSOE-144

    @Luko6
    Luko6 committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    47275e4 View commit details
    Browse the repository at this point in the history

  2. Updating documentation

    @Luko6
    Luko6 committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    c549c12 View commit details
    Browse the repository at this point in the history

  3. Renaming and extending workflow

    @Luko6
    Luko6 committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    7812411 View commit details
    Browse the repository at this point in the history

  4. Correcting workflow name

    @Luko6
    Luko6 committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    f996d40 View commit details
    Browse the repository at this point in the history

  5. Remove trigger

    @Luko6
    Luko6 committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    cfc78b4 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Merge remote-tracking branch 'origin/dev' into issue/OSOE-144

    Márk Lukovics committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    32e6c1a View commit details
    Browse the repository at this point in the history

  2. Renaming file

    Márk Lukovics committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    97cc86b View commit details
    Browse the repository at this point in the history