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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Upgrade Vite to 6.0.11 Merge Conflict Check Workflow #940: Pull request #3545 synchronize by JaiPannu-IITI
February 5, 2025 04:33 12s JaiPannu-IITI:vite-upgrade
JaiPannu-IITI:vite-upgrade
February 5, 2025 04:33 12s
Upgrade Vite to 6.0.11 Merge Conflict Check Workflow #939: Pull request #3545 opened by JaiPannu-IITI
February 5, 2025 02:59 12s JaiPannu-IITI:vite-upgrade
JaiPannu-IITI:vite-upgrade
February 5, 2025 02:59 12s
Code Coverage for src/components/GroupChatDetails/GroupChatDetails.spec.tsx Merge Conflict Check Workflow #938: Pull request #3544 opened by JaiPannu-IITI
February 5, 2025 01:00 11s JaiPannu-IITI:Code-Coverage
JaiPannu-IITI:Code-Coverage
February 5, 2025 01:00 11s
Feature : Added server side verification for all routes . Merge Conflict Check Workflow #937: Pull request #3491 synchronize by PurnenduMIshra129th
February 4, 2025 20:32 14s PurnenduMIshra129th:feature/VerifyRoleRoute
PurnenduMIshra129th:feature/VerifyRoleRoute
February 4, 2025 20:32 14s
Feature : Added server side verification for all routes . Merge Conflict Check Workflow #936: Pull request #3491 synchronize by PurnenduMIshra129th
February 4, 2025 20:26 17s PurnenduMIshra129th:feature/VerifyRoleRoute
PurnenduMIshra129th:feature/VerifyRoleRoute
February 4, 2025 20:26 17s
Upgrade package react-toastify from ^10.0.6 to ^11.0.3 Merge Conflict Check Workflow #935: Pull request #3543 opened by hkumar1729
February 4, 2025 19:09 11s hkumar1729:chore/dependency-upgrade
hkumar1729:chore/dependency-upgrade
February 4, 2025 19:09 11s
Fix GraphQL Queries related to OrganizationDashboard.jsx Merge Conflict Check Workflow #934: Pull request #3534 synchronize by hustlernik
February 4, 2025 18:35 12s hustlernik:api-refactor-1
hustlernik:api-refactor-1
February 4, 2025 18:35 12s
Fix GraphQL Queries related to OrganizationDashboard.jsx Merge Conflict Check Workflow #933: Pull request #3534 synchronize by hustlernik
February 4, 2025 18:28 11s hustlernik:api-refactor-1
hustlernik:api-refactor-1
February 4, 2025 18:28 11s
Fix GraphQL Queries related to OrganizationDashboard.jsx Merge Conflict Check Workflow #932: Pull request #3534 synchronize by hustlernik
February 4, 2025 18:17 11s hustlernik:api-refactor-1
hustlernik:api-refactor-1
February 4, 2025 18:17 11s
Fix GraphQL Queries related to OrganizationDashboard.jsx Merge Conflict Check Workflow #931: Pull request #3534 synchronize by hustlernik
February 4, 2025 17:18 14s hustlernik:api-refactor-1
hustlernik:api-refactor-1
February 4, 2025 17:18 14s
migrate npm test command from Jest to Vitest Merge Conflict Check Workflow #930: Pull request #3542 opened by gkbishnoi07
February 4, 2025 16:45 13s gkbishnoi07:issue-3541
gkbishnoi07:issue-3541
February 4, 2025 16:45 13s
Upgrade package react-toastify from ^10.0.6 to ^11.0.3 Merge Conflict Check Workflow #929: Pull request #3540 opened by hkumar1729
February 4, 2025 14:55 12s hkumar1729:chore/upgrade-dependencies
hkumar1729:chore/upgrade-dependencies
February 4, 2025 14:55 12s
Changed types in query and mutation Merge Conflict Check Workflow #928: Pull request #3539 opened by Nikhilh26
February 4, 2025 14:49 13s Nikhilh26:chore/switching-from-string-to-emailAddress
Nikhilh26:chore/switching-from-string-to-emailAddress
February 4, 2025 14:49 13s
chore: Upgrade package @vitest/coverage-istanbul && fixed failing tests Merge Conflict Check Workflow #927: Pull request #3537 opened by abbi4code
February 4, 2025 10:43 16s abbi4code:upgrade-vitest-package
abbi4code:upgrade-vitest-package
February 4, 2025 10:43 16s
Added app.module.css check Merge Conflict Check Workflow #926: Pull request #3536 synchronize by IITI-tushar
February 4, 2025 06:18 15s IITI-tushar:added-app.module.css-check
IITI-tushar:added-app.module.css-check
February 4, 2025 06:18 15s
fix : add support to queries and mutations to update user profiles Merge Conflict Check Workflow #925: Pull request #3535 synchronize by bandhan-majumder
February 4, 2025 01:41 15s bandhan-majumder:bandhan-majumder/issue-3522-profile
bandhan-majumder:bandhan-majumder/issue-3522-profile
February 4, 2025 01:41 15s
fix : add support to queries and mutations to update user profiles Merge Conflict Check Workflow #924: Pull request #3535 opened by bandhan-majumder
February 4, 2025 01:28 15s bandhan-majumder:bandhan-majumder/issue-3522-profile
bandhan-majumder:bandhan-majumder/issue-3522-profile
February 4, 2025 01:28 15s
Fix GraphQL Queries related to OrganizationDashboard.jsx Merge Conflict Check Workflow #923: Pull request #3534 synchronize by hustlernik
February 3, 2025 23:22 10s hustlernik:api-refactor-1
hustlernik:api-refactor-1
February 3, 2025 23:22 10s
Fix GraphQL Queries related to OrganizationDashboard.jsx Merge Conflict Check Workflow #922: Pull request #3534 opened by hustlernik
February 3, 2025 23:17 11s hustlernik:api-refactor-1
hustlernik:api-refactor-1
February 3, 2025 23:17 11s
Feature : Added server side verification for all routes . Merge Conflict Check Workflow #921: Pull request #3491 synchronize by PurnenduMIshra129th
February 3, 2025 19:41 10s PurnenduMIshra129th:feature/VerifyRoleRoute
PurnenduMIshra129th:feature/VerifyRoleRoute
February 3, 2025 19:41 10s
Feature : Added server side verification for all routes . Merge Conflict Check Workflow #920: Pull request #3491 synchronize by PurnenduMIshra129th
February 3, 2025 18:42 13s PurnenduMIshra129th:feature/VerifyRoleRoute
PurnenduMIshra129th:feature/VerifyRoleRoute
February 3, 2025 18:42 13s
Refactored Dockerfile to Improve Efficiency for develop-postgres branch Merge Conflict Check Workflow #919: Pull request #3532 opened by adithyanotfound
February 3, 2025 13:38 14s adithyanotfound:rfac/docker
adithyanotfound:rfac/docker
February 3, 2025 13:38 14s
Refactored Dockerfile to Improve Efficiency for production Merge Conflict Check Workflow #918: Pull request #3524 synchronize by adithyanotfound
February 3, 2025 13:11 12s adithyanotfound:rfac/dockerfile
adithyanotfound:rfac/dockerfile
February 3, 2025 13:11 12s
Refactored Dockerfile to Improve Efficiency for production Merge Conflict Check Workflow #917: Pull request #3524 synchronize by adithyanotfound
February 3, 2025 12:58 15s adithyanotfound:rfac/dockerfile
adithyanotfound:rfac/dockerfile
February 3, 2025 12:58 15s
Fix Search Functionality for Full Name and Partial Matches in People Section (#3388) Merge Conflict Check Workflow #916: Pull request #3520 synchronize by Nivedita-Chhokar
February 3, 2025 10:37 14s Nivedita-Chhokar:issue-3388
Nivedita-Chhokar:issue-3388
February 3, 2025 10:37 14s