Skip to content

Commit b493481

Browse files
fix: regenerate lockfile to match base branch and prevent merge conflicts
The lockfile in the base branch (14,040 lines) differs from the one in this PR (13,096 lines), causing GitHub's automatic merge to create a corrupted lockfile. Regenerating the lockfile to match the base branch structure prevents the merge conflict and ensures CI can install dependencies correctly. Agent-Logs-Url: https://github.com/objectstack-ai/framework/sessions/b3afac51-116f-4968-b9a0-ac948c2cd362 Co-authored-by: xuyushun441-sys <255036401+xuyushun441-sys@users.noreply.github.com>
1 parent d6fd106 commit b493481

1 file changed

Lines changed: 1300 additions & 356 deletions

File tree

0 commit comments

Comments
 (0)