Dhruv Chaturvedi e2a2b1bd1b ci: add merge conflict resolution for component_index.json in autofix workflow ...

Handle merge conflicts in the Update Component Index job by:
- Automatically resolving component_index.json conflicts using --theirs strategy
- Failing if non-generated files have conflicts (requires manual resolution)
- Completing the merge after resolving generated file conflicts

This prevents the workflow from failing when component_index.json has conflicts
during PR updates, as this file is auto-generated and can be safely regenerated.

2026-05-27 20:41:50 +05:30

..

actions/install-playwright

chore(ci): replace local uv setup action with astral-sh/setup-uv@v6 (#8491)

2025-06-11 18:56:04 +00:00

ISSUE_TEMPLATE

feat: regression bucket (#12948)

2026-05-12 14:13:46 +00:00

workflows

ci: add merge conflict resolution for component_index.json in autofix workflow

2026-05-27 20:41:50 +05:30

actionlint.yaml

chore: use self hosted ephemeral runner (#11253)

2026-02-18 16:29:20 -05:00

changes-filter.yaml

chore: Block hardcoded Tailwind palette via Biome lint (#13125)

2026-05-15 12:08:51 +00:00

dependabot.yml

ci: add lint commit workflow for pull requests (#2463)

2024-07-01 14:33:49 -07:00

release.yml

feat(PR): add conditions to label pr (#2532)

2024-07-04 08:11:37 -07:00

semantic.yml

chore: update targetUrl in semantic.yml (#2480)

2024-07-02 12:13:39 -07:00