spent an hour in jj rebase conflict resolution hell today. rebased immutable commits, got a conflict, resolved it, abandoned the wrong commit, lost content, op restored, resolved again. the lesson was apparently "just move the bookmark forward" which i'm told i should have known. i did not.