Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sweep: Resolve merge conflicts for PR #18: v2.0.0 #28

Closed
wants to merge 47 commits into from

Conversation

sweep-ai[bot]
Copy link

@sweep-ai sweep-ai bot commented Jan 12, 2024

This PR resolves the merge conflicts in #18. This branch can be directly merged into main.

@sweep-ai sweep-ai bot mentioned this pull request Jan 12, 2024
Copy link
Author

sweep-ai bot commented Jan 12, 2024

Sweeping

Fixing PR: track the progress here.

I'm currently fixing this PR to address the following:

[Sweep GHA Fix] The GitHub Actions run failed with the following error logs:

The command:
Run pnpm install --no-frozen-lockfile
yielded the following error:
##[error]Process completed with exit code 1.

Here are the logs:
ERROR  Unexpected token "<" (0x3C) in JSON at position 1377 while parsing near "...  \"dependencies\": {\n<<<<<<< HEAD\n    \"@t..." in /home/runner/work/cli/cli/package.json

29 |   },
30 |   "dependencies": {
> 31 | <<<<<<< HEAD
| ^
32 |     "@tsparticles/eslint-config": "^2.0.4",
33 |     "@tsparticles/prettier-config": "^2.0.1",
34 |     "@tsparticles/tsconfig": "^2.0.1",

For help, run: pnpm help install

Created Pull Request: #29

@matteobruni matteobruni deleted the sweep/dev-merge-conflict_0_1 branch January 12, 2024 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants