Github 'force push'-free workflow

[frankdavid]

Hi everybody,

I started testing jj. I'd like to use it for stacking PRs but without force pushing. My workflow looks like this:

1. I write some code.
2. I send out the code in a PR.
3. I start working on more code that depends on (1).
4. (I may already already send out a second PR at this point)
5. I get feedback on my PR from (1).
6. I change the code and want to update both PRs and the working set.
7. Once the reviews are done, I squash-merge into master.

An important constraint is that while I want to logically amend in my client, I want to avoid force pushing since it messes up the comments in the PR which is very annoying. I'd like that a new commit is pushed to the remote (and the second PR also gets updated with the same commit).

Afaiu, if I want to avoid force pushing, I must create a new change with jj new and then move the bookmarks which is pretty cumbersome. I'm looking for ways to simplify this (and also proposing a setting where this would be done automatically by the tool).

[martinvonz]

IMO, we should not add this feature. It's too much complexity to work around GitHub's poor support for force pushes.

If you decide to not force push, it may be useful to override the default set of immutable commits to say that all remote branches (not just untracked ones) are immutable. See https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits

[steveklabnik]

I must create a new change with jj new and then move the bookmarks which is pretty cumbersome. I'm looking for ways to simplify this (and also proposing a setting where this would be done automatically by the tool).

the alias jj tug that some people have can help with this part, see #5568 and probably some other things I don't have a link for right now.