I don't know what "sagetest -dev commit" does but if it produced the branch that you pushed to 17067 then you should never use it again as that is seriously messed up.
Also, your branch merges automatically with the current master. It seems that your local copy of "master" is 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.
