Hi, is there a way to resolve conflicts when mergi...
# help
t
Hi, is there a way to resolve conflicts when merging 2 branches?