There’s conflict-diff in the main channel. 😖

Thanks for opening this discussion, could you be more specific? I’ll fix right away @fzzr.

could you be more specific?

Just clone the repo and you will see this:

Cargo.toml

...
regex = "1"
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
tokio = "1"
================================
tokio = "1"
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
uuid = { version = "0.8", features = ["serde", "v4"] }
...

I’ve just fixed it there.

https://nest.pijul.com/zj/nidobyte:main/W3M3C7CCWHJWQ.4UCAA

I can’t find it there, maybe I’ve not yet synced all patches. I’ll look at your patch in a bit and either apply that or fix it myself. The sent patch is removing some lines right now I don’t think are intentional.

Hah! :)

https://nest.pijul.com/zj/nidobyte:main/W3M3C7CCWHJWQ.4UCAA

Look at the lines 14-15 there in the Cargo.toml.

I’ll look at your patch in a bit and either apply that or fix it myself.

Thanks. There’s only

• resolve conflicts
• update/rebuild Cargo.lock

Haha, good one. I was looking for literal conflict markers :) The <<<< part. My bad. Will fix soon

Nice, so cloning locally again I do get them. Thanks for pointing it out.

@fzzr this should be resolved. Was indeed missing a patch locally, and wasn’t properly validating before updating here. Could you verify?

@zj I agree, this is resolved. Thanks!

Well, I’m sure this discussion should be closed. Thank you 😊