Simon Wollwage

Results 26 comments of Simon Wollwage

Looking at tokio-signal might be helpful there

Are there any updates on the progress?

I think employing something similar to Page Ranking could prevent single nodes from becoming a point of reference.

I upgraded all dependencies and fixed some stuff. For me locally it works now. Feel free to try again. And sorry for the really long delay. I was bound up...

It should work now. Sorry for the lack of updates, this project is at most in maintenance mode.

Unfortunately not. I developed on WTFTW faster than I could keep the tutorial up to date. And now that Xorg is officially going out of date, I will not update...

I also just stumbled upon this. I can report to have the exact same issue. Is there any solution to it?

Following git's behavior, there is no conflict. So it seems `jj` is doing the same behavior here, but erroneously marks it as a conflict in the transaction.

Should this be handled as a conflict or just merge the files as git does?

Still new to the code base, but I think the issue stems from somewhere in `MergeTree::merge`. Looks like `as_resolved` doesn't try to resolve trivial conflicts. (edit: scratch that, a trivial...