Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Mohammad Mehdi Ghahremanpour
> On Jul 7, 2017, at 5:21 PM, Geoffrey Hutchison > wrote: > > It's worth pointing to the GitHub Flow docs in the future: Sure! thank you for your help today. I will do the GitHub Flow. Best, Mohammad > > https://guides.github.com/introduction/flow/ >

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Geoffrey Hutchison
It's worth pointing to the GitHub Flow docs in the future: https://guides.github.com/introduction/flow/ https://help.github.com/articles/github-flow/

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Mohammad Mehdi Ghahremanpour
This is the link https://github.com/openbabel/openbabel/pull/1597 > On Jul 7, 2017, at 4:41 PM, Mohammad Mehdi Ghahremanpour > wrote: > > It seems that a new pull has been requested. > obthermo updates #1597 > >

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Mohammad Mehdi Ghahremanpour
It seems that a new pull has been requested. obthermo updates #1597 Only for 6 commits. However, the checking has not been completed yet. Mohammad > On Jul 7, 2017, at 4:19 PM, Mohammad Mehdi Ghahremanpour > wrote: > > >> On Jul 7, 2017, at 4:15 PM, Noel O'Boyle

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Mohammad Mehdi Ghahremanpour
> On Jul 7, 2017, at 4:15 PM, Noel O'Boyle wrote: > > I think his edits were on master, so...after resetting they might have > disappeared. Still should be upstream though. What about if I clone a fresh openbabel, checkout a new branch and cherry pick the commit id? >

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Noel O'Boyle
I think his edits were on master, so...after resetting they might have disappeared. Still should be upstream though. On 7 July 2017 at 15:11, Mohammad Mehdi Ghahremanpour wrote: > > On Jul 7, 2017, at 4:00 PM, Geoffrey Hutchison > wrote: > >

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Geoffrey Hutchison
> 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. Yeah, the problem as Noel indicated is that to do the review now, we have

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Noel O'Boyle
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

Re: [OpenBabel-Devel] Isotope table

2017-07-07 Thread Geoffrey Hutchison
> I have some more work to do with adding comments and so forth, but > what I'm wondering is, there's also a file isotope-small.txt. Am I > right in saying that this is legacy and I can ignore (and delete) it? The "small" isotope table was compiled into the data header - it included the most

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Mohammad Mehdi Ghahremanpour
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

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Noel O'Boyle
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 wrote: > Hi Mohammad, > > Here is your pull request: >

Re: [OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Noel O'Boyle
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

[OpenBabel-Devel] pull request for an old patch

2017-07-07 Thread Mohammad Mehdi Ghahremanpour
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