Hacker News new | ask | show | jobs
by Insensitivity 251 days ago
I’ve been using jj for a few months now and still love its workflow, but I keep running into the same problem you mentioned. The advantages of jj far outweigh this issue, so I’d really like to figure out a clean way to avoid these conflicts.
1 comments

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