Thanks. I'm having the recurring problem of first changing filename.py, then running
sage -b and then when I again run sage -t filename.py the error message reflects the old code. Any ideas on what is going wrong? --Mark > AFAIK, you'll need to manually merge in the base (lower) branch into the > dependent (upper) branch (although only when you need the changes in the > base branch) and push the appropriate branch to the server when changes are > made. If there's any changes that were not pulled in from the base branch > to the dependent branch when both are merged, git will take care of it. > > Best, > Travis > > > On Thursday, February 27, 2014 10:21:18 AM UTC-8, Mark Shimozono wrote: > > > > Can someone please explain the proper way to maintain a pair of local > > branches, one dependent on the other, > > all the while keeping both branches synchronized with the server? Assume > > that the > > lower branch is fairly stable but might need to be updated a few times, > > while the upper branch is > > in rapid flux. > > > > Your explanation can then get added to the sage-git primer; at least it > > wasn't clear to me how to > > solve the above problem using the existing explanations. > > > > > > -- > You received this message because you are subscribed to the Google Groups > "sage-combinat-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sage-combinat-devel+unsubscr...@googlegroups.com. > To post to this group, send email to sage-combinat-devel@googlegroups.com. > Visit this group at http://groups.google.com/group/sage-combinat-devel. > For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-combinat-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-combinat-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-combinat-devel. For more options, visit https://groups.google.com/groups/opt_out.
