As someone else said, jj comes into its own when a reviewer insists you split your PR into many commits, because they don't want to review 13k lines in one chunk. In that case it is easier because there is no rebase. To change a PR commit in the middle of the stack you checkout a PR commit, edit it - and done. The rebase happened automagically.
Notice I didn't say "edit it, commit, and done" because that's another thing you don't do in jj - commit. I know, `git commit` is just a few characters on the cli - but it's one of several git commands you will never have to type again because jj does it without having to be asked.
If the rebase created a merge conflict (it could do so in any PR commit above the one you edited) - it's no biggie because jj happily saves merge commits with conflicts. You just check it out, and edit to remove the conflict.
Jj does grow on you over time. For example, when you start with jj you end up in the same messes you did as a git beginner, when you recovered with 'rm -r repository', followed by 'git clone git@host/repository.git'. Then you discover 'jj op restore' which compared to git's reflog is a breath of fresh air. And while you might at first find yourself chafing at the loss of git staging, you gradually get comfortable with the new way of working - then you discover `jj evolog`, and it's "omg that's far better than staging". Ditto with workspaces vs worktrees, and just about everything else. It might be difficult to lose work with a bad git command, but actually impossible to lose work with a jj command.
It is a steep learning curve. We are talking months to use it fluently instead of treating it as git with better porcelain. If all you ever do is work with one commit at a time, it's a lot of effort for not a lot of return. But as soon as you start managing stacks of changes, duplicating them, splicing them, it makes you feel like a god.
That said, if you are starting out - I'd suggest starting with jj instead of git. You've got to go through a learning curve anyway. You may as well do it with the kinder, gentler, more powerful tool.
Git rebases don't work if there are conflicts, jj doesn't have this problem. Also idk if you can rebase onto multiple parents with git but jj can do it.
JJ can save conflict related state with the change so that you don't need to resolve a conflict in the middle of a stack of changes for rebasing to continue for the remaining changes. Concretely, it uses a "conflict algebra" where it can track the impact of a conflict as it propagates through the stack of rebased changes: https://docs.jj-vcs.dev/latest/technical/conflicts/
Not really very similar at all for the scenario discussed here. Rerere remembers how you have resolved a conflict before. It doesn't let you rebase a stack of commits that result in different conflicts. You will have to stop and resolve each conflict and then `git rebase --continue`.
Avoiding manual conflict resolution isn't really a good thing though - conflicts are an indication that multiple different changes affect some code and you really should think hard about what the combination of them should be. Even what git does automatically already can be dangerous.
I prefer `git commit --patch` and having a full editor for commit messages rather than a command-line -m argument to encourage me to actually write something useful.
Great point! Also, steel-cut oats can replace grits in dishes such as grits and eggs. An improvement health-wise obviously, but arguably also taste-wise.
Because painting those who objected to these definitions of mathematical infinity as "horrified" and "disturbed" was a form of character assassination, which was not uncommon at the time. The high moderns didn't play.
Depending on where you live, if you're the type of person who spend most of the day away from home, having some understanding of the weather to expect throughout the day is very useful for not experiencing the weather too much.
Very useful to know if it's likely to rain or be windy, and the highs and lows. I might be leaving at noon when it's comfortable and warm outside, but I might be coming home needing a thick jacket and an umbrella. If I'm already outside experiencing the sudden rainstorm and my umbrella is at home, it doesn't really matter that it wasn't raining when I left home many hours ago.
Yes, but you need this information once, maybe twice a day, instead all smart devices tend to present it to you constantly.
I have a pixel device, and by default I have the weather on both lock screen and home screen. Every morning I receive a notification with the expected weather for the day, and it keeps suggesting me to enable the weather preview right after the morning alarm.
Garmin smartwatch? Same
Android car / Apple car? Same
MacOS has the weather as one of the most prominent widgets available, and I believe windows to be the same.
Do I really need to have weather info constantly available to me?
That's the weather right now. I want to know what the weather will be like through the day and across days. I'd rather do something else in the morning, however if it's ok now and going to rain in two hours, I'll get everyone outside now and do the inside job later. Is it going to clear up soon and I should wait 10 minutes or get worse and I should be getting out right now? Should we put off the march through the woods until tomorrow when it's nicer or do it today because this is the nicest day we'll have this week? Should my wife cycle to the gym? It's ok now but if it's going to be torrential in 15 minutes that'll suck.
The same reason you use a calendar, to plan for the future. I can see the weather right now, but to plan, I want to know the weather in an hour, this afternoon, tomorrow, this weekend. When I am getting ready at 5am, I want to know if I can bike to work, and bike home in the afternoon, without getting rained on. If I'm thinking about weekend plans, should it be kayaking or board games? The weather affects those choices and having an unobtrusive way to just be aware of the future weather is nice to have.
There’s a lot of places where the weather can suddenly change. People want to know if it’s about to start pouring rain in a couple hours despite looking nice right now.
In Colorado the weather shifts are jarring and sudden.
I do find them the most loathsome of the social media platforms I visit. But here's another point -- recent investigations have shown they're not as good a resource for finding jobs anymore[0].
reply