Will try that....Thanks!.... :-) On Sat, Jan 28, 2012 at 12:43 AM, Chris Smith <[email protected]> wrote:
> If you have a fresh master branch, try > > git checkout master > git checkout -b new-prime > git cherry-pick ### (where ### is the sha1 of your commit) > > If there really are merge problems you will hae to do something like > > git status (to see what files were modified) > > and then edit all the files that have <<<< , ========, >>>>>>> in them > (marks showing what was in master and what your new changes are. > > when done, commit the results > > Hope that works! > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/sympy?hl=en. > > -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
