I'm sorry to be really bugging, but this is what happened. I mistakenly pushed in two commits when I was in the master branch, and when I shifted to my current branch almost_linear, I also rebased and then I committed from my almost_linear branch as well (using git commit -f almost_linear).
The result, I obtained strange diff results like the ones shown in these. https://github.com/Manoj-Kumar-S/sympy/commit/5881c6484fadb4ad826e0d038e0fbf6421d5d491 https://github.com/Manoj-Kumar-S/sympy/commit/8f8d907115036b66aef05c35b318965d136e5d6d https://github.com/sympy/sympy/pull/1864/files#r3253985 There are a number of tests that are deleted , which haven't been done by me, and there are pprint statements which have been modified which I have no idea of. Ive also tried various things in Stack Overflow such as git reset HEAD, but it doesn't seem to work. Here is my git reflog statement. 118916c HEAD@{0}: checkout: moving from 118916cd78eab54e2503a21100d226b9fd4d1a41 to master 118916c HEAD@{1}: checkout: moving from almost_linear to 118916cd78eab54e2503a21100d226 2d4006e HEAD@{2}: checkout: moving from master to almost_linear 118916c HEAD@{3}: commit (merge): Tests conflicts 8f8d907 HEAD@{4}: reset: moving to HEAD@{1} 345adb6 HEAD@{5}: commit: Tests conflict 8f8d907 HEAD@{6}: reset: moving to HEAD@{11} 5881c64 HEAD@{7}: checkout: moving from almost_linear to master 2d4006e HEAD@{8}: reset: moving to HEAD@{4} 5881c64 HEAD@{9}: reset: moving to HEAD~1 118916c HEAD@{0}: checkout: moving from 118916cd78eab54e2503a21100d226b9fd4d1a41 to mas 118916c HEAD@{1}: checkout: moving from almost_linear to 118916cd78eab54e2503a21100d226 2d4006e HEAD@{2}: checkout: moving from master to almost_linear 118916c HEAD@{0}: checkout: moving from 118916cd78eab54e2503a21100d226b9fd4d1a41 to mas 118916c HEAD@{1}: checkout: moving from almost_linear to 118916cd78eab54e2503a21100d226 2d4006e HEAD@{2}: checkout: moving from master to almost_linear 118916c HEAD@{3}: commit (merge): Tests conflicts 8f8d907 HEAD@{4}: reset: moving to HEAD@{1} 345adb6 HEAD@{5}: commit: Tests conflict 8f8d907 HEAD@{6}: reset: moving to HEAD@{11} 5881c64 HEAD@{7}: checkout: moving from almost_linear to master 2d4006e HEAD@{8}: reset: moving to HEAD@{4} 5881c64 HEAD@{9}: reset: moving to HEAD~1 c188107 HEAD@{10}: commit: Made new changes 5881c64 HEAD@{11}: rebase finished: returning to refs/heads/almost_linear 5881c64 HEAD@{12}: checkout: moving from almost_linear to 5881c6484fadb4ad826e0d038e0fb 2d4006e HEAD@{13}: commit: Made new changes a8ad07f HEAD@{14}: commit (amend): Almost linear equations-first implementation 0ccc6bb HEAD@{15}: reset: moving to HEAD~1 392aeab HEAD@{16}: checkout: moving from master to almost_linear 5881c64 HEAD@{17}: commit (merge): changes 8f8d907 HEAD@{18}: commit: Changes --> Two commits by mistake Could someone please tell me systematically what I need to do right now. Because I haven't been able to really work on anything for a couple of days and most of my time goes in figuring out what went wrong. I know basics of git, but this seems a bit too much foe me. -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sympy?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
