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

[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/ 
> 
> https://help.github.com/articles/github-flow/ 
> 
> 
> -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

--
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

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

[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/ 


-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

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

[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
> 
> 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 >> > 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
>>> > wrote:
 
 On Jul 7, 2017, at 4:00 PM, Geoffrey Hutchison >
 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

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

[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  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
>>  wrote:
>>> 
>>> On Jul 7, 2017, at 4:00 PM, Geoffrey Hutchison 
>>> 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

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

[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? 

> 
> On 7 July 2017 at 15:11, Mohammad Mehdi Ghahremanpour
>  wrote:
>> 
>> On Jul 7, 2017, at 4:00 PM, Geoffrey Hutchison 
>> 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

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

[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:
>
> 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

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

[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 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??

# 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

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

[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 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
 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  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  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
>  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

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

[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 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  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  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
>>  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

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

[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:
> 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
>  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

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

[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 the change you are
describing.

Regards,
- Noel

On 7 July 2017 at 14:05, Mohammad Mehdi Ghahremanpour
 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

[OpenBabel-Devel] pull request for an old patch

[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 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