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 look
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 de
I thought I understood cherry-picking, but can't get it to work in
practice. Can somebody please explain what I'm missing?
*Setup*
1. Start with a plain text file in *master* with two rows in it (one
commit per row):
1. L1
2. L2
2. Create a branch (*workbranch*) and check i
