root42, 10 days ago Is there a way to resolve #git cherrypick conflicts purely on the command line, without using a merge tool by saying „use theirs“? Or „keep upper“?
Is there a way to resolve #git cherrypick conflicts purely on the command line, without using a merge tool by saying „use theirs“? Or „keep upper“?