Comment

Comment by conradludgate

I still don't understand the way jj handles conflicts. If I rebase and then fix a conflict later, are those conflict markers going to appear in some of the commits on github when I push?

Maybe I'm in the minority, but I like fixing conflicts as I go. What am I missing?

Discussion

Live from the official Hacker News API

A modern reader for Hacker News · SvelteKit + Skeleton