[stavros]

What does git think of the tree after you pull? Does everything seem fine to git, but jj shows a conflict?