diff --git a/.github/workflows/frontend_unit_tests.yml b/.github/workflows/frontend_unit_tests.yml index 41c53862c5c6b..c33f5771e1829 100644 --- a/.github/workflows/frontend_unit_tests.yml +++ b/.github/workflows/frontend_unit_tests.yml @@ -18,12 +18,8 @@ on: - synchronize - reopened - closed + workflow_dispatch: -concurrency: - group: ${{ github.workflow }}-${{ github.event_name }}-${{ - github.event.pull_request.number || github.event.merge_group.head_ref - || github.ref || github.run_id }} - cancel-in-progress: true jobs: setup_merge_sha: name: Capture develop SHA diff --git a/conflict_test.txt b/conflict_test.txt new file mode 100644 index 0000000000000..460ff034616b6 --- /dev/null +++ b/conflict_test.txt @@ -0,0 +1,5 @@ +<<<<<<< HEAD +Branch 3 change +======= +Develop change 6 +>>>>>>> develop