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

..

matchers

Update linting workflows for frontend and Python code (#2171)

2024-06-14 06:27:48 -07:00

add-labels.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

auto-update.yml

bugfix: fix api request custom component (#2470)

2024-07-04 05:05:22 -07:00

ci.yml

Merge main source updates into release-1.10.0

2026-05-15 09:47:56 -07:00

codeql.yml

ci: bump actions/checkout to v6 (#10697)

2025-11-24 12:27:06 +00:00

community-label.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

conventional-labels.yml

build(deps):(deps): bump Namchee/conventional-pr from 0.15.5 to 0.15.6 (#6059)

2025-02-03 15:21:04 +00:00

create-release.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

cross-platform-test.md

feat: introduce lfx package (#9133)

2025-09-02 17:45:53 +00:00

cross-platform-test.yml

fix(ci): use local bundle wheels in nightly install tests (#13257)

2026-05-20 19:46:40 -07:00

deploy_gh-pages.yml

ci: make docs deployment manual-only (#11602)

2026-02-10 11:48:33 +00:00

deploy-docs-draft.yml

fix: prevent CI injection via unsanitized GitHub context interpolation (#12224)

2026-03-19 19:40:26 +00:00

deploy-storybook.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

docker_test.yml

fix: Clear input fields data operations (#11773)

2026-02-24 03:55:27 +00:00

docker-build-v2.yml

fix: allow backend/frontend Docker builds when main version exists (#12854)

2026-04-23 17:49:53 -07:00

docker-build.yml

fix: Properly grep for the langflow version (#12486)

2026-04-03 15:02:11 +00:00

docker-nightly-build.yml

fix: update Docker base images to Trixie and force pull latest images in nightly builds (#13015)

2026-05-06 23:26:11 +00:00

docs_test.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

extension-migration-checks.yml

feat(lfx): Bundle Separation and LFX Extension Framework (#13043)

2026-05-18 17:36:56 +00:00

gp-backend-check.yml

feat: backend i18n — serve translated component metadata via Accept-Language (#12517)

2026-04-29 13:43:21 +00:00

gp-download.yml

feat: backend i18n — serve translated component metadata via Accept-Language (#12517)

2026-04-29 13:43:21 +00:00

gp-test.yml

feat: IBM Globalization Pipeline integration and i18n setup (#12226)

2026-04-08 17:51:18 +00:00

gp-upload.yml

feat: backend i18n — serve translated component metadata via Accept-Language (#12517)

2026-04-29 13:43:21 +00:00

integration_tests.yml

chore: support Python 3.14 (#13085)

2026-05-13 22:23:39 +00:00

jest_test.yml

test: add playwright code coverage (#12294)

2026-03-23 20:50:01 +00:00

js_autofix.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

lint-js.yml

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

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

lint-py.yml

chore: support Python 3.14 (#13085)

2026-05-13 22:23:39 +00:00

mend.yml

chore: address eric's comment 1

2026-04-21 16:18:16 -04:00

migration-validation.yml

test: add PostgreSQL to migration CI tests (#12257)

2026-03-25 13:26:56 +00:00

nightly_build.yml

ci: backport bundle/nightly CI fixes from main (#13206, #13207, #13208) (#13210)

2026-05-19 10:12:54 -07:00

py_autofix.yml

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

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

python_test.yml

chore: support Python 3.14 (#13085)

2026-05-13 22:23:39 +00:00

regression-stub.yml

feat: regression bucket (#12948)

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

release_bundles.yml

ci: backport bundle/nightly CI fixes from main (#13206, #13207, #13208) (#13210)

2026-05-19 10:12:54 -07:00

release_nightly.yml

fix(ci): use local bundle wheels in nightly install tests (#13257)

2026-05-20 19:46:40 -07:00

release-lfx.yml

chore: support Python 3.14 (#13085)

2026-05-13 22:23:39 +00:00

release.yml

Update release.yml

2026-05-14 14:39:20 -07:00

request-docs-review.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

smoke-tests.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

store_pytest_durations.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

style-check-py.yml

ci: bump actions/checkout to v6 (#10697)

2025-11-24 12:27:06 +00:00

template-tests.yml

chore: Update outdated GitHub Actions versions (#11316)

2026-01-21 18:38:45 +00:00

test-coverage-advisor.yml

chore: Add non-blocking test coverage advisor for PRs (#13148)

2026-05-15 17:36:17 +00:00

typescript_test.yml

fix: add stream toggle back to agent (#13155)

2026-05-18 13:30:08 +00:00