On Thursday, December 10, 2015 at 2:25:45 PM UTC-8, prateek sharma wrote: > > I had pushed my branch on trac but I am unable to see any commit on > trac.Can anybody tell me why? >
Your branch shows up red. That means that an automatic merge of your branch with the reference branch (the "develop" branch on trac) is not succeeding. That probably means your branch is based on a branch that is too far removed from "develop". You should rebase/merge your branch with the current develop branch (resolving conflicts properly) and push that. Second, you can click on "Commits" which gives you the history of the branch. The latest commit it shows there is Do not allow creation of ticket titled "help" <http://git.sagemath.org/sage.git/commit/?h=a27ca28dcbe20e91bb77337d5c36af05a1287315> from 9 days ago. So it doesn't look like your work is committed in the branch that you pushed in the first place. I would: - pull trac's develop (that doesn't have your change yet) - make a new branch of that - Change the one file that has your little change (perhaps just copy that file into the tree) - confirm that the "diff" at this point is exactly what you want - commit the change - push *that* branch to the trac ticket. That should give you a fairly clean commit easily, and would be easier than trying to diagnose the mess you're in now. relevant xkcd: http://xkcd.com/1597/ -- 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.
