Am Freitag, 5. Dezember 2014 11:49:54 UTC+1 schrieb Volker Braun: > > On Friday, December 5, 2014 9:13:12 AM UTC, Simon King wrote: >> >> would result in resolving the same conflicts twice. Certainly there is a >> better way!?! >> > > Don't merge branches unless you have to. >
I still don't understand when one has to and when not. I am not able to automatically merge #17435 into develop and not able to automatically merge develop into #17435. Does that mean I have to merge branches? When I try to resolve the conflicts, I am asked once more to resolve conflicts that I have already done in the past---even though I have git rerere enabled, and had it enabled when I resolved the conflicts. I have since re-installed my laptop's OS, but I suppose rerere will store data in my home directory, which has been preserved while reinstalling the OS. So, what to do? Do all the work AGAIN? Best regards, Simon -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
