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

feat: update GitHub Actions Workflow for Merge Conflict #269

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: update GitHub Actions Workflow for Merge Conflict #269

wants to merge 3 commits into from
+98 −0

Commits on Jan 18, 2024

  1. add script for marge conflict

    @mhmohona
    mhmohona committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    afe6fe6 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. update as per review

    @mhmohona
    mhmohona committed May 8, 2024
    Configuration menu
    Copy the full SHA
    1c30042 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'master' into conflict

    @quetzalliwrites
    quetzalliwrites authored May 9, 2024
    Configuration menu
    Copy the full SHA
    0b9421a View commit details
    Browse the repository at this point in the history