Re: [sage-devel] Question on git merge

2017-07-11 Thread Daniel Krenn
On 2017-07-11 14:39, Simon King wrote: > Being on a different git branch, I tried >git cherry-pick xyz Why cherry-pick and not simply git merge xyz ? This could git help finding a proper merge base. -- You received this message because you are subscribed to the Google Groups "sage-devel"

[sage-devel] Question on git merge

2017-07-11 Thread Simon King
Dear all, sorry to ask a (probably stupid) question on git here, but my question arose from trying to do SageMath development. I have a commit xyz with a very small changeset: It modifies a single line in a single file my_file. Being on a different git branch, I tried git cherry-pick xyz