Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Updating a PR needs --force, but --force-with-lease might be better?
did:key:z6MkwcUR...q1kL opened 9 months ago

When working with PRs and updating a PR, one normally wants to push their rebased changes with --force-with-lease instead of --force.

But when updating a PR with --force-with-lease, rad errors with

... rejected ... non-fast-forward

which seems ... bad? I am not sure. I've grown used to always use --force-with-lease, which verifies that my local repository state does know about the latest changes in a PR.

Now, I am not entirely sure about how the whole PR workflow actually works, as the rad remote seems to be some special remote that does magic to get things right (at least from my POV).

Maybe instead of force-pushing, it would be better to have something like "hey rad, update my PR with the changes in this branch, yes I know that I rebased", but on the other hand git-push is also the right thing here.

I am not entirely sure what I want to express with this issue here, but my experience so far felt like "I am destroying things, is this really the way?" instead of "Yeah, update my PR here!"

Either way: Thanks for building this, I love it so far!

lorenz added ux 9 months ago
lorenz added crate=radicle-remote-helper 9 months ago
lorenz added patch 9 months ago
z6MkgFq6...nBGz added type=improvement 8 months ago