jj is actaully great at this since it natively tracks branches which aren't heads correctly, so all rebases and merges work without stashing.