Check for merge conflicts

chore: update upstream to v8.0.0 #147

Sign in to view logs

Triggered via pull request October 3, 2025 16:10

opened #132

update-upstream-v8.0.0

Status Failure

Total duration 12s

Artifacts –

check-merge-conflicts.yml

on: pull_request

check-conflicts

Annotations

2 errors

check-conflicts

Process completed with exit code 1.

check-conflicts: ./.husky/pre-commit ./.github/workflows/expo-doctor.yml ./jest.config.js ./__mocks__/expo-localization.ts ./README.md ./app.config.ts ./eas.json ./docs/pnpm-lock.yaml ./docs/astro.config.mjs ./docs/src/content/docs/faq.md ./docs/src/content/docs/ui-and-theme/components.mdx ./docs/src/content/docs/index.mdx ./pnpm-lock.yaml ./package.json ./env.js ./eslint.config.mjs ./.prettierrc.js ./tsconfig.json ./src/components/inputs.tsx ./src/components/login-form.tsx ./src/components/typography.tsx ./src/components/ui/icons/settings.tsx ./src/components/ui/select.test.tsx ./src/components/ui/focus-aware-status-bar.tsx ./src/components/ui/select.tsx ./src/components/ui/input.test.tsx ./src/components/ui/progress-bar.tsx ./src/components/ui/modal.tsx ./src/components/ui/checkbox.test.tsx ./src/components/buttons.tsx ./src/components/title.tsx ./src/components/settings/language-item.tsx ./src/components/login-form.test.tsx ./src/components/colors.tsx ./src/lib/auth/index.tsx ./src/lib/i18n/types.ts ./src/app/feed/add-post#L0

Merge conflict found in ./.husky/pre-commit