Why is so hard to simply push to Github?

[tamadamas]

I've read Steve books, readme, docs and seems I know how to work with jj but every time I need to push it fails with several reasons:

• Empty commits
• Missing description
• Missing anything else...
  Whatever! Why can't I just push my perfect code to my great git repo?
  Today while I abandoned several commits, I've got 10 minutes merging conflicts and they all just local changes and I'm only one dev in repo. Why can't it just remove broken or blank commits automatically? I can't even use git because there no git folder and I assume I need another hour to just handle rhings around pushing

[joyously]

Git is more restrictive than Jujutsu is.
You can likely conjure a revset for empty commits or empty descriptions or conflicts, so that you can abandon or describe or resolve them in bulk. But I doubt that anyone would really want to have the push command filter out the commits that don't meet Git standards and push the rest because it's piecemeal and inconsistent.

[tamadamas]

But the tool might be more helpful if we need new users using it and Gihub is the top priority for supporting. I don't care about empty stuff and small jj recisions until push. So the tool can be more supportive there.
In current state it is not ready and so toxic for real usage with production code. And I'm senior dev, I can't even talk about teaching my juniors to using it with all that toxic workflow.

[jennings]

• Empty commits
• Missing description
• Missing anything else...

There is no restriction on pushing empty commits, you can push those to GitHub all you want.

But, I think most users would consider it a mistake to push commits that do not have descriptions. So, jj prevents this mistake.

We currently have jj git push --ignore-private for allowing private commits to be pushed. Maybe we should replace that with --ignore-restrictions to do both jobs, or add --ignore-empty-description. What do you think?

I can't even use git because there no git folder

You may want to colocate your repositories, so you can use git and jj in the same repository. You can create colocated repositories with jj git init --colocate and jj git clone --colocate, and there are instructions available for converting an existing repository to colocated. There is an open PR for adding commands to do this for you.

[tamadamas]

it might help. I'll try that, thanks

[jennings]

This discussion board and the Discord are both friendly to newcomers. We are happy to help and discuss how we can improve jj.

[tamadamas]

This discussion board and the Discord are both friendly to newcomers. We are happy to help and discuss how we can improve jj.

Feel free put friendly suggestions right into error messages. Git does it, rust compiler does it and don't afraid Git-detached state. It's our best friend and lazyjj TUI

It might help

[ilyagr]

Feel free put friendly suggestions right into error messages.

We try when we can, and we're interested in ideas. Feel free to file FRs for specific situations when you think a hint would help, or to discuss such suggestions elsewhere. It sometimes takes work to come up with a good hint, but it can be quite valuable to do.

Another option is to write docs (or find/edit existing docs) and have hints point to them via URLs.

[tamadamas]

In case you're curiois. Convering jj to git only helped. There were conflict in the middle that I could not simple solved (3-way Carl). On a file 20 lines and I've just pushed new branch and new pull request with strange but working command. Git is awesome in helping by the way, jj must learn here.

In case you're curios, it's public anyway tamadamas/zigox#1

[tamadamas]

And all my code is safe. Thank you for you help. Colocation is awesome, I will use it for pushing

[jennings]

The command git push HEAD:refs/... is awkwardly long because you aren't relying on a lot of defaults that Git has around specifying refs. jj git push -c rumv could have done the same, assuming that branch name is a change ID.

[jennings]

In case you're curios, it's public anyway tamadamas/zigox#1

UPDATE: My original message was probably mistaken. I've left it at the bottom of this post for posterity.

I think the problem is that the commits in your branch were conflicted.

Git requires conflicts to be resolved before creating a commit. But merges and rebases always succeed in jj, even if there are conflicts. The conflict information is stored in the conflict as structured data so it can be dealt with later.

jj won't let you push commits that have unresolved conflicts, but git will. It would be safer to always use jj to push, or at least ensure all the commits you're pushing do not say "conflict" in the log.

---

Original measage follows:

Looking at that PR, it looks like you inadvertently committed the .jjconflict directories that appeared in a conflict.

When you edit a conflicted commit with jj, git status shows some extra directories named .jjconflict-base-N for technical reasons.

I think you may have added these to the index then committed with git.

Instead, you should resolve the conflict with jj resolve or by simply editing out the conflict markers and letting jj snapshot the result.

[tamadamas]

The command git push HEAD:refs/... is awkwardly long because you aren't relying on a lot of defaults that Git has around specifying refs. jj git push -c rumv could have done the same, assuming that branch name is a change ID.

I've tried. My maim issue were > I'm on empty (jj new). I moved my main@origin to precious good described change and I'm trying to push main=>origin-main as I do in git (git push -u) configured years ago with just git push and jj says I can't push, description is empty.

^_^ Got, dude, I know! That's exactly the reason I've done with jj new just earlier and then rev _whatever_ is empty so I'm forced to abandon it because I'm sure it's empty without any code related. The yesterday I failed cause it had have code and got 1-hour story with merging conflicts.

Ok, I got your point, jj undo but it's even dangerous. What if it undoes very valuable many-hour-code change (btw the same with abandon and sh -> rm) but tool MUST MUST help me. Not shot-my-leg-thing.

Check commit is empty, ask me twice, suggest command, do backup but my code MUST be safe and available to PUSH
(Imagine 1-billion production bug and me trying to fight with VCS cli tool inatead of fixing it).
Nobody will pay me for fixing my dev local story...

So, I glad I trying it in my nobody-interested-home-pet-project and not in crytical-production-app.
Sorry, but tool is toxic and unfriendly right now. Or we just need to throw Github a letter to support jj as second backend