Skip to content

chore: promote Farm v2 stable release - #2304

Draft
wre232114 with Copilot wants to merge 4 commits into
mainfrom
copilot/promote-farm-v2-release
Draft

chore: promote Farm v2 stable release#2304
wre232114 with Copilot wants to merge 4 commits into
mainfrom
copilot/promote-farm-v2-release

Conversation

Copilot AI commented May 24, 2026

Copy link
Copy Markdown
Contributor
  • Inspect branch, working tree, and shallow clone state
  • Unshallow repository and fetch origin/main explicitly
  • Merge origin/main into current branch
  • Resolve Cargo.lock merge conflict by keeping stable Farm 2.0.0 internal crate versions and origin/main Sass grass dependency
  • Run minimal validation: conflict marker search, git diff --check, cargo metadata --no-deps
  • Create true two-parent merge commit and push result

Copilot AI and others added 2 commits May 24, 2026 12:07
Agent-Logs-Url: https://github.com/farm-fe/farm/sessions/17ca36a5-962e-49fc-a803-9db804851193

Co-authored-by: wre232114 <8372439+wre232114@users.noreply.github.com>
Agent-Logs-Url: https://github.com/farm-fe/farm/sessions/17ca36a5-962e-49fc-a803-9db804851193

Co-authored-by: wre232114 <8372439+wre232114@users.noreply.github.com>
@vercel

vercel Bot commented May 24, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
farm-docs Ready Ready Preview, Comment May 24, 2026 4:20pm

Agent-Logs-Url: https://github.com/farm-fe/farm/sessions/5dbc1cf2-9aac-433e-ba96-3be355906304

Co-authored-by: wre232114 <8372439+wre232114@users.noreply.github.com>
@changeset-bot

changeset-bot Bot commented May 24, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: c2d1e9a

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

💥 An error occurred when fetching the changed packages and changesets in this PR
Some errors occurred when validating the changesets config:
The package or glob expression "farm-docs" is specified in the `ignore` option but it is not found in the project. You may have misspelled the package name or provided an invalid glob expression. Note that glob expressions must be defined according to https://www.npmjs.com/package/micromatch
The package or glob expression "bench" is specified in the `ignore` option but it is not found in the project. You may have misspelled the package name or provided an invalid glob expression. Note that glob expressions must be defined according to https://www.npmjs.com/package/micromatch

Co-authored-by: wre232114 <8372439+wre232114@users.noreply.github.com>
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