When something goes wrong with Git, it can be difficult to fix especially given that you have been working on the master rather than a branch. What you describe here is not a rebase, but even so, it doesn't explain why so many files are included.
What I would do to fix this is delete my Github repo (but not my local repo obviously - or else all is lost), fork it again, check it out locally as a different new repo, create a branch for this fix, reapply my changes manually by looking at the diffs in my original local repo, push the branch to a branch on Github, and submit a new pull request. Unless Geoff or someone else has a better suggestion... - Noel On 7 July 2017 at 14:42, Mohammad Mehdi Ghahremanpour <ghahramanpou...@gmail.com> wrote: > Hi Noel, > > Thanks for your reply. > > To rebase, I ran these commands > > git remote add upstream https://github.com/openbabel/openbabel.git > git fetch upstream > git pull upstream master > git push > > Before doing that, my branch was ahead by 6 commits and was behind by > several commits, while after rebasing it is written that my branch is ahead > by 6 commits. > > How can I fix the rebasing if it was incorrect. > > Thanks, > Mohammad > > On Jul 7, 2017, at 3:26 PM, Noel O'Boyle <baoille...@gmail.com> wrote: > > I beg your pardon, here is the link: > https://github.com/openbabel/openbabel/pull/337 > > On 7 July 2017 at 14:25, Noel O'Boyle <baoille...@gmail.com> wrote: > > Hi Mohammad, > > Here is your pull request: > https://github.com/openbabel/openbabel/pull/337/files/9fdfc1120fff9fd3009df4cfe8d789c92a49c1e1..beba494f1c977dca1af1279eab267d65c0f3261e > > I think that you have not rebased correctly. The pull request contains > a huge number of commits that are unrelated to the change you are > describing. > > Regards, > - Noel > > On 7 July 2017 at 14:05, Mohammad Mehdi Ghahremanpour > <ghahramanpou...@gmail.com> wrote: > > Hello developers, > > I requested pull for a patch updating obthermo on August 29, 2016 and fixed > the problems of the patch on September 1, 2016. However, the patch has not > been merged, yet. I have rebased the master branch in my fork and pushed > again to request a new pull. Apparently, the new request has not been added > to the list of Pull requests. > > This is the patch > https://github.com/openbabel/openbabel/compare/master...mmghahremanpour:master > > How I can solve this problem? > > Thank you, > Mohammad > > > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > OpenBabel-Devel mailing list > OpenBabel-Devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openbabel-devel > > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ OpenBabel-Devel mailing list OpenBabel-Devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbabel-devel
