Comment by martinvonz

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