Skip to content

chore: Update dependencies and configuration - #1408

Closed
AvivAbachi wants to merge 9 commits into
mainfrom
chore-update-dependencies-to-latest-versions
Closed

chore: Update dependencies and configuration#1408
AvivAbachi wants to merge 9 commits into
mainfrom
chore-update-dependencies-to-latest-versions

Conversation

@AvivAbachi

@AvivAbachi AvivAbachi commented Jan 9, 2026

Copy link
Copy Markdown
Collaborator
  • @mui/x-date-pickers - complext changes

@github-actions

github-actions Bot commented Jan 9, 2026

Copy link
Copy Markdown
Contributor

@AvivAbachi
AvivAbachi requested a review from NoamGaash January 9, 2026 14:49
…age.json and package-lock.json

test: update dashboard test to use regex for dynamic text matching

test: refactor operator test to ensure total is greater than zero
@AvivAbachi
AvivAbachi removed the request for review from NoamGaash January 9, 2026 16:49
@AvivAbachi
AvivAbachi marked this pull request as draft January 9, 2026 16:49
@NoamGaash

Copy link
Copy Markdown
Member

@claude can you solve conflicts?

@claude

claude Bot commented Jan 20, 2026

Copy link
Copy Markdown
Contributor

Claude finished @NoamGaash's task in 2m 33s —— View job


Resolving merge conflicts ✅

  • Check current git status and identify any conflicts
  • Fetch latest changes from origin/main
  • Attempt to merge origin/main into current branch
  • Resolve conflicts in 18 files (kept PR's dependency updates, added .envrc to .gitignore)
  • Commit and push the merge

Summary: Successfully resolved all merge conflicts! The issue was caused by a shallow git clone treating the branches as unrelated histories. I resolved 18 files by:

  1. Keeping the PR's dependency updates - This PR is specifically for updating dependencies, so I preserved all the version updates in package.json and package-lock.json
  2. Added .envrc to .gitignore - The only actual change from origin/main was adding .envrc to the gitignore file, which I incorporated

The merge commit has been pushed to the branch. The CI checks will verify that everything builds and passes tests correctly.

Note: I couldn't run local verification checks (npm install, lint, build) due to the Node.js version in the CI environment (v20.19.6) being incompatible with the updated package.json requirement (node>=22.0.0). The CI pipeline should handle this with the correct Node version.

--- | Branch

Co-authored-by: Noam Gaash <NoamGaash@users.noreply.github.com>
@AvivAbachi AvivAbachi closed this Feb 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants