This is my first code review request, so I may have done some things wrong. I think the following URL should work? https://github.com/MisterSheik/numpy/compare Best, Neil
On Sun, Oct 27, 2013 at 7:23 PM, Neil Girdhar <mistersheik@gmail.com> wrote:
This is my first code review request, so I may have done some things wrong. I think the following URL should work? https://github.com/MisterSheik/numpy/compare
The first thing to do is make a new branch for your work. Probably the easiest way from where you are is to make the branch, which will have your changes in it, then go back to master and git reset --hard to the last commit before your work. Working in master is a big no-no. See `doc/source/dev/gitwash/development_workflow.rst`. When you are ready, make a PR for that branch. The code will get reviewed at that point.
Chuck
Yeah, I realized that I missed that and figured it wouldn't matter since it was my own master and I don't plan on making other changes to numpy. If you don't mind, how do I move my changelist into a branch? I'm really worried I'm going to lose my changes. On Sun, Oct 27, 2013 at 9:38 PM, Charles R Harris <charlesr.harris@gmail.com
wrote:
On Sun, Oct 27, 2013 at 7:23 PM, Neil Girdhar <mistersheik@gmail.com>wrote:
This is my first code review request, so I may have done some things wrong. I think the following URL should work? https://github.com/MisterSheik/numpy/compare
The first thing to do is make a new branch for your work. Probably the easiest way from where you are is to make the branch, which will have your changes in it, then go back to master and git reset --hard to the last commit before your work. Working in master is a big no-no. See `doc/source/dev/gitwash/development_workflow.rst`. When you are ready, make a PR for that branch. The code will get reviewed at that point.
Chuck
_______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
Is this what I want? https://github.com/numpy/numpy/pull/3987 On Sun, Oct 27, 2013 at 9:42 PM, Neil Girdhar <mistersheik@gmail.com> wrote:
Yeah, I realized that I missed that and figured it wouldn't matter since it was my own master and I don't plan on making other changes to numpy. If you don't mind, how do I move my changelist into a branch? I'm really worried I'm going to lose my changes.
On Sun, Oct 27, 2013 at 9:38 PM, Charles R Harris < charlesr.harris@gmail.com> wrote:
On Sun, Oct 27, 2013 at 7:23 PM, Neil Girdhar <mistersheik@gmail.com>wrote:
This is my first code review request, so I may have done some things wrong. I think the following URL should work? https://github.com/MisterSheik/numpy/compare
The first thing to do is make a new branch for your work. Probably the easiest way from where you are is to make the branch, which will have your changes in it, then go back to master and git reset --hard to the last commit before your work. Working in master is a big no-no. See `doc/source/dev/gitwash/development_workflow.rst`. When you are ready, make a PR for that branch. The code will get reviewed at that point.
Chuck
_______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
On Sun, Oct 27, 2013 at 9:42 PM, Neil Girdhar <mistersheik@gmail.com> wrote:
Yeah, I realized that I missed that and figured it wouldn't matter since it was my own master and I don't plan on making other changes to numpy. If you don't mind, how do I move my changelist into a branch? I'm really worried I'm going to lose my changes.
'master' is just another branch. You can do: git checkout -b new_branch_name In your current repository to create a new branch pointing to where you are now (the master branch which you want to move) Chuck's instructions follow that: git checkout master git reset --hard origin/master Some people advise that you just delete the 'master' branch on your local repository/forks. This can simplify the process of accidentally committing to it, though it's easy to recover from. Cheers, Aron
participants (3)
-
Aron Ahmadia
-
Charles R Harris
-
Neil Girdhar