Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Maybe you know this already but it's `jj squash --into @----` whether there are conflicts or not.


I didn't know that, but I'm not surprised that this is possible because jj allows you to defer conflict resolution. I for one prefer git's step-by-step rebase model that makes you address conflicts at the time of the rebase. If you aren't ready to address conflicts, you shouldn't be mucking around with the commit history yet. Also, if you turn on rerere, then you can also (usually) avoid fixing the same conflicts multiple times.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: