[baq]

committable conflicts give you painless rebases. if you know about rerere, try jj; if you don't, it might not be worth it.