How do you incrementally resolve merge conflicts in magit? | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		trueismywork 6 months ago \| parent \| context \| favorite \| on: Jujutsu for everyone How do you incrementally resolve merge conflicts in magit?

wry_discontent 6 months ago [–]

I don't know what that means. I haven't changed how I resolve conflicts with jj.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact