Skip to content

Actions: PalisadoesFoundation/talawa-admin

Actions

Merge Conflict Check Workflow

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-check.yml
749 workflow runs
749 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Revert "Migrating from eslintrc.json to eslint.config.js" Merge Conflict Check Workflow #24: Pull request #3160 opened by palisadoes
January 5, 2025 17:27 23s revert-2660-issue#2645
revert-2660-issue#2645
January 5, 2025 17:27 23s
Code Coverage Improvement in 'OrganizationTags.tsx' #3031 Merge Conflict Check Workflow #23: Pull request #3158 opened by arpit-chakraborty
January 5, 2025 16:44 10s arpit-chakraborty:arpit-chakraborty#3031
arpit-chakraborty:arpit-chakraborty#3031
January 5, 2025 16:44 10s
Feature/admin docs gen Merge Conflict Check Workflow #22: Pull request #3157 opened by Rukhsarkh
January 5, 2025 15:53 14s Rukhsarkh:feature/admin-docs-gen
Rukhsarkh:feature/admin-docs-gen
January 5, 2025 15:53 14s
Migrated src/components/TableLoader/TableLoader.test.tsx from jest to vitest Merge Conflict Check Workflow #21: Pull request #3156 opened by syedali237
January 5, 2025 15:35 14s syedali237:isuue-2822
syedali237:isuue-2822
January 5, 2025 15:35 14s
#2970:autodoc-generate Merge Conflict Check Workflow #20: Pull request #3151 synchronize by Rukhsarkh
January 5, 2025 14:49 10s Rukhsarkh:feature/admin-docs-refactor
Rukhsarkh:feature/admin-docs-refactor
January 5, 2025 14:49 10s
Feature: Added Talawa-admin to run system daemon service in Linux, Added Eslint for Markdown file and updated the deprecated eslint Merge Conflict Check Workflow #19: Pull request #3130 synchronize by sahitya-chandra
January 5, 2025 14:44 9s sahitya-chandra:linux-systemd-service
sahitya-chandra:linux-systemd-service
January 5, 2025 14:44 9s
Increased code coverage in src/components/AddOn/core/AddOnStore.spec.tsx Merge Conflict Check Workflow #18: Pull request #3154 opened by syedali237
January 5, 2025 14:43 10s syedali237:issue-3045
syedali237:issue-3045
January 5, 2025 14:43 10s
#2970:autodoc-generate Merge Conflict Check Workflow #17: Pull request #3151 synchronize by Rukhsarkh
January 5, 2025 14:22 10s Rukhsarkh:feature/admin-docs-refactor
Rukhsarkh:feature/admin-docs-refactor
January 5, 2025 14:22 10s
Feature: Added Talawa-admin to run system daemon service in Linux, Added Eslint for Markdown file and updated the deprecated eslint Merge Conflict Check Workflow #16: Pull request #3130 synchronize by sahitya-chandra
January 5, 2025 13:47 12s sahitya-chandra:linux-systemd-service
sahitya-chandra:linux-systemd-service
January 5, 2025 13:47 12s
To check working of Merge Conflict Job Merge Conflict Check Workflow #15: Pull request #3153 opened by Aad1tya27
January 5, 2025 13:46 13s Aad1tya27:issue-3015
Aad1tya27:issue-3015
January 5, 2025 13:46 13s
#2970:autodoc-generate Merge Conflict Check Workflow #14: Pull request #3151 synchronize by Rukhsarkh
January 5, 2025 13:32 14s Rukhsarkh:feature/admin-docs-refactor
Rukhsarkh:feature/admin-docs-refactor
January 5, 2025 13:32 14s
#2883 Refactor CSS files in miscellaneous components Merge Conflict Check Workflow #13: Pull request #3116 synchronize by pranavnathe
January 5, 2025 13:32 11s pranavnathe:RefactorCSSmiscellaneousComponents
pranavnathe:RefactorCSSmiscellaneousComponents
January 5, 2025 13:32 11s
#2883 Refactor CSS files in miscellaneous components Merge Conflict Check Workflow #12: Pull request #3116 synchronize by pranavnathe
January 5, 2025 13:29 10s pranavnathe:RefactorCSSmiscellaneousComponents
pranavnathe:RefactorCSSmiscellaneousComponents
January 5, 2025 13:29 10s
Migrating from eslintrc.json to eslint.config.js Merge Conflict Check Workflow #11: Pull request #2660 synchronize by Suyash878
January 5, 2025 12:49 12s Suyash878:issue#2645
Suyash878:issue#2645
January 5, 2025 12:49 12s
Feature: Added Talawa-admin to run system daemon service in Linux, Added Eslint for Markdown file and updated the deprecated eslint Merge Conflict Check Workflow #10: Pull request #3130 synchronize by sahitya-chandra
January 5, 2025 12:49 17s sahitya-chandra:linux-systemd-service
sahitya-chandra:linux-systemd-service
January 5, 2025 12:49 17s
Migrating from eslintrc.json to eslint.config.js Merge Conflict Check Workflow #9: Pull request #2660 synchronize by Suyash878
January 5, 2025 12:45 13s Suyash878:issue#2645
Suyash878:issue#2645
January 5, 2025 12:45 13s
Fixed error message in PostCard.tsx Merge Conflict Check Workflow #8: Pull request #3152 opened by Nivedita-Chhokar
January 5, 2025 12:45 14s Nivedita-Chhokar:issue-3142
Nivedita-Chhokar:issue-3142
January 5, 2025 12:45 14s
Migrating from eslintrc.json to eslint.config.js Merge Conflict Check Workflow #7: Pull request #2660 synchronize by Suyash878
January 5, 2025 12:42 12s Suyash878:issue#2645
Suyash878:issue#2645
January 5, 2025 12:42 12s
#2970:autodoc-generate Merge Conflict Check Workflow #6: Pull request #3151 synchronize by Rukhsarkh
January 5, 2025 12:19 10s Rukhsarkh:feature/admin-docs-refactor
Rukhsarkh:feature/admin-docs-refactor
January 5, 2025 12:19 10s
Feature: Added Talawa-admin to run system daemon service in Linux, Added Eslint for Markdown file and updated the deprecated eslint Merge Conflict Check Workflow #5: Pull request #3130 synchronize by sahitya-chandra
January 5, 2025 12:18 10s sahitya-chandra:linux-systemd-service
sahitya-chandra:linux-systemd-service
January 5, 2025 12:18 10s
Merge Conflict Job added in merge-conflict-check.yml file Merge Conflict Check Workflow #4: Pull request #3147 synchronize by Aad1tya27
January 5, 2025 11:48 11s Aad1tya27:issue-3015
Aad1tya27:issue-3015
January 5, 2025 11:48 11s
Merge Conflict Job added in merge-conflict-check.yml file Merge Conflict Check Workflow #3: Pull request #3147 synchronize by Aad1tya27
January 5, 2025 09:56 13s Aad1tya27:issue-3015
Aad1tya27:issue-3015
January 5, 2025 09:56 13s
Merge Conflict Job added in merge-conflict-check.yml file Merge Conflict Check Workflow #2: Pull request #3147 synchronize by Aad1tya27
January 5, 2025 09:47 14s Aad1tya27:issue-3015
Aad1tya27:issue-3015
January 5, 2025 09:47 14s
Merge Conflict Job added in merge-conflict-check.yml file Merge Conflict Check Workflow #1: Pull request #3147 opened by Aad1tya27
January 5, 2025 02:39 11s Aad1tya27:issue-3015
Aad1tya27:issue-3015
January 5, 2025 02:39 11s
ProTip! You can narrow down the results and go further in time using created:<2025-01-05 or the other filters available.