merge dev main

[plebhash]

fix #870

[lorbax]

The least commit shared between this branch and main is this one which is not on top of main. Seems that this does not solve the issue

[plebhash]

The least commit shared between this branch and main is this one which is not on top of main. Seems that this does not solve the issue

@lorbax can you elaborate on what you see as a problem here?

these are the steps that led me to this PR:

git checkout origin dev
git checkout -b dev-merge-main
git merge origin main
# there was a confict on roles/Cargo.lock, which I solved by picking the state from `main`
git merge --continue
git push plebhash dev-merge-main
# opened PR

tried to rebase manually commit by commit dev on main
this is the result
https://github.com/lorbax/stratum/tree/dev-rebased

I think manually rebasing every commit is too error prone. We should be able to fix this with a few commands.

[Fi3]

there was a confict on roles/Cargo.lock, which I solved by picking the state from main

If you are going to merge on dev you should take the state from dev not main

Considering that this PR do not change any code

This ofc assuming that lock on dev do not have any issue

[lorbax]

I was wrong, the least common ancestor between this branch and main branch is the HEAD of main branch, so this PR solves the issue. It would have been better to rebase dev on main, so that we do not mess up with history of commits, which is what I tried to do in my branch (before you publish this PR)
https://github.com/lorbax/stratum/tree/dev-rebased
Next time we should declare the issues we are working in!

[plebhash]

there was a confict on roles/Cargo.lock, which I solved by picking the state from main

If you are going to merge on dev you should take the state from dev not main

Considering that this PR do not change any code

This ofc assuming that lock on dev do not have any issue

roles/Cargo.lock is outdated on dev.

I noticed that because I use CLion and it automatically updates the lockfiles. So I got many conflicts on git because of that.

3ec6b50 updated this lockfile on main, and that was the motivation for picking the state of main on this merge conflict.

[Fi3]

there was a confict on roles/Cargo.lock, which I solved by picking the state from main

If you are going to merge on dev you should take the state from dev not main
Considering that this PR do not change any code
This ofc assuming that lock on dev do not have any issue

roles/Cargo.lock is outdated on dev.

I noticed that because I use CLion and it automatically updates the lockfiles. So I got many conflicts on git because of that.

3ec6b50 updated this lockfile on main, and that was the motivation for picking the state of main on this merge conflict.

ok make sense

[plebhash]

It would have been better to rebase dev on main, so that we do not mess up with history of commits, which is what I tried to do in my branch (before you publish this PR) https://github.com/lorbax/stratum/tree/dev-rebased

dev...lorbax:stratum:dev-rebased

This diff shows 23 files being changed, where most of those changes were already introduced in PRs recently merged into dev. Is that expected? Git rebase is a bit confusing to me sometimes, that is why I went for a merge.

But if you prefer this approach we can replace this PR with another one from your branch, that would be no problem for me.

[lorbax]

It would have been better to rebase dev on main, so that we do not mess up with history of commits, which is what I tried to do in my branch (before you publish this PR) https://github.com/lorbax/stratum/tree/dev-rebased

dev...lorbax:stratum:dev-rebased

This diff shows 23 files being changed, where most of those changes were already introduced in PRs recently merged into dev. Is that expected? Git rebase is a bit confusing to me sometimes, that is why I went for a merge.

But if you prefer this approach we can replace this PR with another one from your branch, that would be no problem for me.

For me it is fine whatever does work. There is not huge history that can possibly be messed up btw

[Fi3]

no you shouldn't get 23 diff files. IMO merging main on dev is ok.