Yes, it does appear to resolve the merge conflict when done this way. The only difference was using
git commit instead of committing via the dev scripts (sage -dev commit). It's nice to know it wasn't me not understanding the conflict resolution process, but some issue with the script. On Sunday, January 25, 2015 at 12:12:34 PM UTC-5, Ben Hutz wrote: > > Yes, my master does have the lastest develop on it. There is a ticket > closed between beta5 and beta6 that conflicts with 17067. So the old master > merges fine in any case. > > OK. I'll reset and commit via git and see if that fixes the issue. > > btw, the 'sagetest -dev commit' is doing the commit via the dev scripts > where sagetest is my symbolic link to that version of sage. It seems you > are saying that the dev scripts for commit is broken?? > > -- 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 sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
