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

fixed #3318 Figma: Refactor CSS files in src/components/OrganizationCard Merge Conflict Check Workflow #549: Pull request #3384 opened by gurramkarthiknetha
January 22, 2025 05:54 11s gurramkarthiknetha:issue-3318-fixed
gurramkarthiknetha:issue-3318-fixed
January 22, 2025 05:54 11s
refactor CSS src/components/EventRegistrantsModal Merge Conflict Check Workflow #548: Pull request #3383 opened by prathmesh703
January 22, 2025 03:14 11s prathmesh703:Refactor-CSS
prathmesh703:Refactor-CSS
January 22, 2025 03:14 11s
#3174 Action Item Pages Violate The Figma Style Guide Merge Conflict Check Workflow #547: Pull request #3372 synchronize by pranavnathe
January 22, 2025 03:13 13s pranavnathe:FigmaActionItem#3174
pranavnathe:FigmaActionItem#3174
January 22, 2025 03:13 13s
#3174 Action Item Pages Violate The Figma Style Guide Merge Conflict Check Workflow #546: Pull request #3372 synchronize by pranavnathe
January 22, 2025 02:58 10s pranavnathe:FigmaActionItem#3174
pranavnathe:FigmaActionItem#3174
January 22, 2025 02:58 10s
Fixes[MemberDetail] : Refactor CSS files in src/screens/MemberDetail and updated the import file Merge Conflict Check Workflow #545: Pull request #3373 synchronize by Bittukr7479
January 21, 2025 20:28 10s Bittukr7479:Bittukr7479-refacor-csss-memberDetail
Bittukr7479:Bittukr7479-refacor-csss-memberDetail
January 21, 2025 20:28 10s
Fixes[GoroupChatDetails]: Refactor CSS files in src/components/GroupChatDetails and updated the import Merge Conflict Check Workflow #544: Pull request #3380 synchronize by Bittukr7479
January 21, 2025 20:23 16s Bittukr7479:refactor-css-groupChatDetails
Bittukr7479:refactor-css-groupChatDetails
January 21, 2025 20:23 16s
Updating to NEW COLOR SCHEME 3 Merge Conflict Check Workflow #543: Pull request #3354 synchronize by rahulch07
January 21, 2025 19:58 11s rahulch07:update-css-2880
rahulch07:update-css-2880
January 21, 2025 19:58 11s
Updating to NEW COLOR SCHEME 3 Merge Conflict Check Workflow #542: Pull request #3354 synchronize by rahulch07
January 21, 2025 19:22 13s rahulch07:update-css-2880
rahulch07:update-css-2880
January 21, 2025 19:22 13s
Fixes[GoroupChatDetails]: Refactor CSS files in src/components/GroupChatDetails and updated the import Merge Conflict Check Workflow #541: Pull request #3380 opened by Bittukr7479
January 21, 2025 17:28 11s Bittukr7479:refactor-css-groupChatDetails
Bittukr7479:refactor-css-groupChatDetails
January 21, 2025 17:28 11s
Fixed ESLint bugs that required ts-specific rules for js functions and added prettier formatting (re-open #3184) Merge Conflict Check Workflow #540: Pull request #3229 synchronize by yugal07
January 21, 2025 17:12 12s yugal07:issue-3184-reopen
yugal07:issue-3184-reopen
January 21, 2025 17:12 12s
BugFix : Fixed Improper Handling for Non-Numeric Values in Allotted hours section of Create Action item modal Merge Conflict Check Workflow #539: Pull request #3379 opened by yugal07
January 21, 2025 16:44 15s yugal07:issue-3368
yugal07:issue-3368
January 21, 2025 16:44 15s
Fix: day or year view render on event page Merge Conflict Check Workflow #538: Pull request #3378 opened by PratapRathi
January 21, 2025 16:18 14s PratapRathi:fix/day-year-view-render-on-event-page
PratapRathi:fix/day-year-view-render-on-event-page
January 21, 2025 16:18 14s
Improve readability of INSTALLATION.md file Merge Conflict Check Workflow #537: Pull request #3377 reopened by SnowFlowerr
January 21, 2025 16:01 13s SnowFlowerr:develop
SnowFlowerr:develop
January 21, 2025 16:01 13s
Improve readability of INSTALLATION.md file Merge Conflict Check Workflow #536: Pull request #3377 opened by SnowFlowerr
January 21, 2025 15:59 11s SnowFlowerr:develop
SnowFlowerr:develop
January 21, 2025 15:59 11s
Bugfix: fixed duplication of chats Merge Conflict Check Workflow #535: Pull request #3360 synchronize by Aad1tya27
January 21, 2025 15:54 11s Aad1tya27:issue-3301-fix2
Aad1tya27:issue-3301-fix2
January 21, 2025 15:54 11s
Fixes: The Login and Organization Screens Merge Conflict Check Workflow #534: Pull request #3309 synchronize by prathmesh703
January 21, 2025 14:18 15s prathmesh703:login_ui
prathmesh703:login_ui
January 21, 2025 14:18 15s
Fixes: The Login and Organization Screens Merge Conflict Check Workflow #533: Pull request #3309 synchronize by prathmesh703
January 21, 2025 14:01 13s prathmesh703:login_ui
prathmesh703:login_ui
January 21, 2025 14:01 13s
#3174 Action Item Pages Violate The Figma Style Guide Merge Conflict Check Workflow #532: Pull request #3372 synchronize by pranavnathe
January 21, 2025 11:08 13s pranavnathe:FigmaActionItem#3174
pranavnathe:FigmaActionItem#3174
January 21, 2025 11:08 13s
#3174 Action Item Pages Violate The Figma Style Guide Merge Conflict Check Workflow #531: Pull request #3372 synchronize by pranavnathe
January 21, 2025 10:33 11s pranavnathe:FigmaActionItem#3174
pranavnathe:FigmaActionItem#3174
January 21, 2025 10:33 11s
Fixes[MemberDetail] : Refactor CSS files in src/screens/MemberDetail and updated the import file Merge Conflict Check Workflow #530: Pull request #3373 synchronize by Bittukr7479
January 21, 2025 09:52 12s Bittukr7479:Bittukr7479-refacor-csss-memberDetail
Bittukr7479:Bittukr7479-refacor-csss-memberDetail
January 21, 2025 09:52 12s
Fix: Venue details now update without requiring a name change Merge Conflict Check Workflow #529: Pull request #3302 synchronize by gkbishnoi07
January 21, 2025 09:07 12s gkbishnoi07:issue-3300
gkbishnoi07:issue-3300
January 21, 2025 09:07 12s
homepage/doc-sidebar-fixation Merge Conflict Check Workflow #528: Pull request #3374 opened by Rukhsarkh
January 21, 2025 09:01 12s Rukhsarkh:feature/admin-docs-gen
Rukhsarkh:feature/admin-docs-gen
January 21, 2025 09:01 12s
Feature/admin docs gen Merge Conflict Check Workflow #527: Pull request #3259 synchronize by Rukhsarkh
January 21, 2025 08:42 16s Rukhsarkh:feature/admin-docs-gen
Rukhsarkh:feature/admin-docs-gen
January 21, 2025 08:42 16s
Fixes[MemberDetail] : Refactor CSS files in src/screens/MemberDetail and updated the import file Merge Conflict Check Workflow #526: Pull request #3373 opened by Bittukr7479
January 21, 2025 08:06 12s Bittukr7479:Bittukr7479-refacor-csss-memberDetail
Bittukr7479:Bittukr7479-refacor-csss-memberDetail
January 21, 2025 08:06 12s
#3174 Action Item Pages Violate The Figma Style Guide Merge Conflict Check Workflow #525: Pull request #3372 synchronize by pranavnathe
January 21, 2025 07:59 11s pranavnathe:FigmaActionItem#3174
pranavnathe:FigmaActionItem#3174
January 21, 2025 07:59 11s