how do most people have ivy set up to resolve conf...
# general
g
how do most people have ivy set up to resolve conflicts?