@steveklabnik.com yes, I experienced this as well. Not as many commits beyond the conflict, but I find conflict resolution in #jjvcs to be superior to #sapling.

On the other hand, I much prefer Sapling's GitHub integration than jj's. Sapling maintains the PR title and description from the first commit's message when `sl push`, and I really liked that.