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.

Sign up for GitHub

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

Jump to bottom

Failed to auto-update cargo-generate #307

Closed
github-actions bot opened this issue Sep 19, 2024 · 2 comments
Closed

Failed to auto-update cargo-generate #307

github-actions bot opened this issue Sep 19, 2024 · 2 comments

Comments

@github-actions
Copy link

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)

Changes to be committed:
  new file:   .github/workflows/release.yaml.template
  new file:   Cargo.toml.template
  new file:   post-generate.rhai
  new file:   src/audio.rs.template
  new file:   src/lib.rs.template
  new file:   src/main.rs.template
  new file:   web/index.html.template

Unmerged paths:
(use "git add <file>..." to mark resolution)
  both added:      cargo-generate.toml
  both modified:   src/lib.rs
  both modified:   web/index.html
git diff --diff-filter=U 
diff --cc cargo-generate.toml
index 1fd6d6f,fc3807e..0000000
--- a/cargo-generate.toml
+++ b/cargo-generate.toml
@@@ -1,13 -1,9 +1,21 @@@
[template]
++<<<<<<< HEAD
+include = [
+    ".github/workflows/*",
+    "Cargo.toml",
+    "Cargo.lock",
+    "src/lib.rs",
+    "src/main.rs",
+    "src/audio.rs",
+    "web/index.html",
+]
++=======
+ ignore = ["target", "Cargo.lock"]
+ include = ["*.template"]
+ 
+ [hooks]
+ post = ["post-generate.rhai"]
++>>>>>>> main

[placeholders.itch_username]
prompt = "Enter your itch.io username. Leave blank to disable itch.io upload."
diff --cc src/lib.rs
index 21ab143,05c1b78..0000000
--- a/src/lib.rs
+++ b/src/lib.rs
@@@ -37,7 -37,7 +37,11 @@@ impl Plugin for AppPlugin 
                })
                .set(WindowPlugin {
                    primary_window: Window {
++<<<<<<< HEAD
+                        title: "{{project-name | title_case}}".to_string(),
++=======
+                         title: "Bevy Quickstart".to_string(),
++>>>>>>> main
                        canvas: Some("#bevy".to_string()),
                        fit_canvas_to_parent: true,
                        prevent_default_event_handling: true,
diff --cc web/index.html
index f109672,cc4593e..0000000
--- a/web/index.html
+++ b/web/index.html
@@@ -3,7 -3,7 +3,11 @@@

<head>
    <meta charset="utf-8" />
++<<<<<<< HEAD
+    <title>{{project-name}}</title>
++=======
+     <title>Bevy Quickstart</title>
++>>>>>>> main
    <link data-trunk rel="copy-dir" href="../assets" />
    <link data-trunk rel="inline" href="style.css" />
    <link data-trunk rel="inline" type="module" href="restart-audio-context.js" />

This is an automated message created by cargo-generate.yaml.
@TheBevyFlock TheBevyFlock deleted a comment Sep 19, 2024
@benfrankel
Copy link
Collaborator

This is fine because the cargo-generate branch is going to be deleted after #308.

@benfrankel
Copy link
Collaborator

#308 is merged and the cargo-generate branch has been deleted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@benfrankel