2012/10/24 Andrea Lazzarotto <[email protected]> > Is there a way to redo the merge?
Finally I got it. I manually replaced the offending files from: <<<<<<< local [line A] ======= [line B] >>>>>>> other With just [line B] and it worked. Thank you for pointing me in the right direction. ;) Best regards, -- *Andrea Lazzarotto* - http://andrealazzarotto.com* * -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel?hl=en.
