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?? On Sunday, January 25, 2015 at 12:02:58 PM UTC-5, Volker Braun wrote: > > Just to be clear, reset master *after* checking it out: > > git checkout master > git fetch trac master > git reset --hard FETCH_HEAD > > > On Sunday, January 25, 2015 at 6:01:04 PM UTC+1, Volker Braun wrote: >> >> old or unrelated to our master branch. You should first update/reset it: >> >> git fetch trac master >> git reset --hard FETCH_HEAD >> >> Then, to recover, you should throw away your most recent commit >> >> git checkout t/17067/ticket/17067 # or whatever your local branch name is >> git reset --hard HEAD~ >> git merge master >> >> Your branch does have a conflict with the current "develop" branch. >> Assuming that your local "develop" branch is up to date, you would do >> >> git merge develop >> git mergetool # fix >> git commit >> >> If you then try to "git merge develop" again you'll see that git does >> nothing. >> >> >> >> >> On Sunday, January 25, 2015 at 5:19:20 PM UTC+1, Ben Hutz wrote: >>> >>> Here are the commands and output. You can see after I complete the >>> commit, I try to merge again, and the conflicts remain. >>> >> -- 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.
