The problem I see with your interpretation of what went wrong (which I
simply assume to know), is that you attribute the resulting conflict
markers to git-cherry-pick not working as expected.
I suspect that git-cherry-pick just doesn't know where to put the patch
and defaults to git-merge
Hello Brian,
the patch you are getting is actually the difference between L3 and
workbranch (Line3). What you are facing is a conflict resolution: you have
different modifications for the same file; in this case, both master~1 and
workbranch added lines to the test.txt file, and now you have to
