title: Retain author after a cherry-pick conflict
body: <p>after a conflict i get the message to use git commit -c xxxxxx. When i do that i get another window having the desciption of my commit +a author  but have no idea how to move on from there. </p>