TheBevyFlock / bevy_new_2d

This template is a great way to get started on a new 2D Bevy game!
https://the-bevy-flock.itch.io/bevy-new-2d
MIT License
186 stars 30 forks source link

Failed to auto-update `cargo-generate` #290

Closed github-actions[bot] closed 2 months ago

github-actions[bot] commented 2 months ago

There were merge conflicts while trying to update cargo-generate from main. You can do it manually by running:

# Update your local copy of the `main` branch.
git switch main
git pull
# Checkout the `cargo-generate` branch.
git checkout cargo-generate
# Merge changes from `main` to `cargo-generate`. You will have to fix merge conflicts.
git merge main
git status ``` On branch cargo-generate Your branch is up to date with 'origin/cargo-generate'. You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution) deleted by us: .github/workflows/cargo-generate.yaml no changes added to commit (use "git add" and/or "git commit -a") ```
git diff --diff-filter=U ```diff * Unmerged path .github/workflows/cargo-generate.yaml ```

This is an automated message created by cargo-generate.yaml.

BD103 commented 2 months ago

Completed in 769865a16dace75bcd21a74b022598fce8b840a6.

janhohenheim commented 2 months ago

@BD103 thanks :)