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
> <ghahramanpou...@gmail.com> wrote:
>
>
>> On Jul 7, 2017, at 4:15 PM, Noel O'Boyle <baoille...@gmail.com> 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?
>
>>
>> On 7 July 2017 at 15:11, Mohammad Mehdi Ghahremanpour
>> <ghahramanpou...@gmail.com> wrote:
>>>
>>> On Jul 7, 2017, at 4:00 PM, Geoffrey Hutchison <geoff.hutchi...@gmail.com>
>>> wrote:
>>>
>>> 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 to
>>> sift through dozens of completely unrelated changes. I can't tell at all
>>> what are your changes for this particular pull request. It's a mess now.
>>>
>>> So the best solution is to create a new branch for a new request with just
>>> your commits.
>>>
>>> # Create a new branch:
>>> git checkout master
>>> git reset -- hard upstream/master # make sure your "master" only has the
>>> same as upstream
>>> git checkout -b my-new-patch
>>>
>>> # now "cherry-pick" the commits from your previous branch
>>> git cherry-pick # git commit ids.. maybe 9fdfc11 for example??
>>>
>>>
>>> Thank you for your solution. I did it but I am not sure if it worked
>>> properly.
>>> These are the messages I obtained:
>>>
>>> → git checkout master
>>> Already on 'master'
>>> Your branch is up-to-date with 'origin/master’.
>>>
>>> → git reset -- hard upstream/master
>>>
>>> → git checkout -b obthermo-update-patch
>>> Switched to a new branch 'obthermo-update-patco'
>>>
>>> → git cherry-pick 9fdfc1120fff9fd3009df4cfe8d789c92a49c1e1
>>> On branch obthermo-update-patch
>>> You are currently cherry-picking commit 9fdfc11.
>>>
>>> nothing to commit, working directory clean
>>> The previous cherry-pick is now empty, possibly due to conflict resolution.
>>> If you wish to commit it anyway, use:
>>>
>>> git commit --allow-empty
>>>
>>> Otherwise, please use 'git reset'
>>>
>>> Excuse my confusion! Should I commit it even though it is empty?
>>>
>>> Best,
>>> Mohammad
>>>
>>>
>>>
>>> # Then push the new branch as a pull request
>>>
>>> Hope that helps,
>>> -Geoff
>>>
>>>
>
------------------------------------------------------------------------------
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
