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.
There were merge conflicts while trying to update
cargo-generate
frommain
. You can do it manually by running:
``` 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/rmgit status
```diff * Unmerged path .github/workflows/cargo-generate.yaml ```git diff --diff-filter=U
This is an automated message created by
cargo-generate.yaml
.