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
261 workflow runs
261 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Refactor Pladges.test.txt from jest to vitest #2577 Merge Conflict Check Workflow #211: Pull request #3245 opened by khushipatil1523
January 10, 2025 17:24 14s khushipatil1523:refactor_pladges_from_jest_to_vitest
khushipatil1523:refactor_pladges_from_jest_to_vitest
January 10, 2025 17:24 14s
Merged from develop Merge Conflict Check Workflow #210: Pull request #3244 opened by palisadoes
January 10, 2025 16:48 12s palisadoes:new-main
palisadoes:new-main
January 10, 2025 16:48 12s
Merge from develop Merge Conflict Check Workflow #209: Pull request #3243 opened by palisadoes
January 10, 2025 16:26 14s palisadoes:new-main
palisadoes:new-main
January 10, 2025 16:26 14s
Feature/admin docs gen Merge Conflict Check Workflow #208: Pull request #3157 synchronize by bint-Eve
January 10, 2025 15:21 16s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 15:21 16s
Feature/admin docs gen Merge Conflict Check Workflow #207: Pull request #3157 synchronize by bint-Eve
January 10, 2025 14:56 13s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 14:56 13s
Feature/admin docs gen Merge Conflict Check Workflow #206: Pull request #3157 synchronize by bint-Eve
January 10, 2025 14:52 15s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 14:52 15s
#2887 Refactor CSS in src/screens/OrganizationActionItems/OrganizationActionItems.tsx Merge Conflict Check Workflow #205: Pull request #3242 opened by pranavnathe
January 10, 2025 14:31 18s pranavnathe:RefactorCSS#2887
pranavnathe:RefactorCSS#2887
January 10, 2025 14:31 18s
Feature/admin docs gen Merge Conflict Check Workflow #204: Pull request #3157 synchronize by bint-Eve
January 10, 2025 14:24 14s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 14:24 14s
Feature/admin docs gen Merge Conflict Check Workflow #203: Pull request #3157 synchronize by bint-Eve
January 10, 2025 14:16 11s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 14:16 11s
Feature/admin docs gen Merge Conflict Check Workflow #202: Pull request #3157 synchronize by bint-Eve
January 10, 2025 14:08 14s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 14:08 14s
refactor:vitest to GroupModal.tsx Merge Conflict Check Workflow #201: Pull request #3226 synchronize by shivasankaran18
January 10, 2025 13:46 10s shivasankaran18:issue-2581
shivasankaran18:issue-2581
January 10, 2025 13:46 10s
Feature/admin docs gen Merge Conflict Check Workflow #200: Pull request #3157 synchronize by bint-Eve
January 10, 2025 13:40 11s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 13:40 11s
Feature/admin docs gen Merge Conflict Check Workflow #199: Pull request #3157 synchronize by bint-Eve
January 10, 2025 13:22 15s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 13:22 15s
Feature/admin docs gen Merge Conflict Check Workflow #198: Pull request #3157 synchronize by bint-Eve
January 10, 2025 12:37 15s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 12:37 15s
Feature/admin docs gen Merge Conflict Check Workflow #197: Pull request #3157 synchronize by bint-Eve
January 10, 2025 12:14 12s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 12:14 12s
Feature/admin docs gen Merge Conflict Check Workflow #196: Pull request #3157 synchronize by bint-Eve
January 10, 2025 11:43 10s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 11:43 10s
Feature/admin docs gen Merge Conflict Check Workflow #195: Pull request #3157 synchronize by bint-Eve
January 10, 2025 11:38 16s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 11:38 16s
BugFix : Display user name instead of "undefined undefined" when making a post in an organization Merge Conflict Check Workflow #194: Pull request #3241 opened by yugal07
January 10, 2025 10:23 16s yugal07:issue-
yugal07:issue-
January 10, 2025 10:23 16s
Fixed LeftDrawerOrg Visibility Merge Conflict Check Workflow #193: Pull request #3239 opened by aadhil2k4
January 10, 2025 07:00 9s aadhil2k4:issue#3237
aadhil2k4:issue#3237
January 10, 2025 07:00 9s
setup of vitest Merge Conflict Check Workflow #192: Pull request #3238 opened by NishantSinghhhhh
January 10, 2025 06:49 12s NishantSinghhhhh:setup-vitest
NishantSinghhhhh:setup-vitest
January 10, 2025 06:49 12s
Feature/admin docs gen Merge Conflict Check Workflow #191: Pull request #3157 synchronize by bint-Eve
January 10, 2025 04:18 12s bint-Eve:feature/admin-docs-gen
bint-Eve:feature/admin-docs-gen
January 10, 2025 04:18 12s
fix: Update regex to detect all variants of /* istanbul ignore */ comments #3217 Merge Conflict Check Workflow #190: Pull request #3221 synchronize by khushipatil1523
January 10, 2025 03:34 16s khushipatil1523:Updation_for_Code_coverage_disable_check.py_#3217
khushipatil1523:Updation_for_Code_coverage_disable_check.py_#3217
January 10, 2025 03:34 16s
Merge from develop-postgres prior to code freeze Merge Conflict Check Workflow #189: Pull request #3234 opened by palisadoes
January 10, 2025 03:07 15s palisadoes:new-develop
palisadoes:new-develop
January 10, 2025 03:07 15s
'Visit' Button Feature Added to Joined Organizations Filter Merge Conflict Check Workflow #188: Pull request #3232 synchronize by gkbishnoi07
January 10, 2025 02:37 15s gkbishnoi07:button-changes
gkbishnoi07:button-changes
January 10, 2025 02:37 15s
'Visit' Button Feature Added to Joined Organizations Filter Merge Conflict Check Workflow #187: Pull request #3232 synchronize by gkbishnoi07
January 10, 2025 01:53 14s gkbishnoi07:button-changes
gkbishnoi07:button-changes
January 10, 2025 01:53 14s