I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works. Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in. So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list: * devel And that's it... So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request? If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time). Thanks, Brian
Detailed instructions at: https://github.com/sukria/Dancer/blob/devel/lib/Dancer/Development.pod Look for the "Patch Submission" section. Cheers, Flavio. On Wed, Mar 23, 2011 at 12:38 AM, Brian E. Lozier <brian@massassi.com>wrote:
I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works.
Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in.
So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list:
* devel
And that's it...
So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request?
If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time).
Thanks, Brian _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
This is extremely helpful, thanks! On Tue, Mar 22, 2011 at 6:04 PM, Flavio Poletti <polettix@gmail.com> wrote:
Detailed instructions at: https://github.com/sukria/Dancer/blob/devel/lib/Dancer/Development.pod Look for the "Patch Submission" section. Cheers, Flavio.
On Wed, Mar 23, 2011 at 12:38 AM, Brian E. Lozier <brian@massassi.com> wrote:
I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works.
Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in.
So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list:
* devel
And that's it...
So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request?
If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time).
Thanks, Brian _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
_______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
I'm also understand nothing about git, but http://advent.perldancer.org/2010/24 can help, I think. On 23.03.2011 4:38, Brian E. Lozier wrote:
I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works.
Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in.
So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list:
* devel
And that's it...
So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request?
If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time).
Thanks, Brian _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
-- Best Regards, Nick Knutov http://knutov.com ICQ: 272873706 Voice: +7-904-84-23-130
It occurs to me that it would be nice to have links to both of these pages on your contribute page: http://perldancer.org/contribute On Tue, Mar 22, 2011 at 6:17 PM, Nick Knutov <mail@knutov.com> wrote:
I'm also understand nothing about git, but http://advent.perldancer.org/2010/24 can help, I think.
On 23.03.2011 4:38, Brian E. Lozier wrote:
I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works.
Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in.
So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list:
* devel
And that's it...
So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request?
If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time).
Thanks, Brian _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
-- Best Regards, Nick Knutov http://knutov.com ICQ: 272873706 Voice: +7-904-84-23-130 _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
I think you can propose a patch for this as well: https://github.com/sukria/perldancer-website/blob/master/views/contribute.tt <https://github.com/sukria/perldancer-website/blob/master/views/contribute.tt> :-) Cheers, Flavio. On Wed, Mar 23, 2011 at 3:42 PM, Brian E. Lozier <brian@massassi.com> wrote:
It occurs to me that it would be nice to have links to both of these pages on your contribute page:
http://perldancer.org/contribute
On Tue, Mar 22, 2011 at 6:17 PM, Nick Knutov <mail@knutov.com> wrote:
I'm also understand nothing about git, but http://advent.perldancer.org/2010/24 can help, I think.
On 23.03.2011 4:38, Brian E. Lozier wrote:
I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works.
Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in.
So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list:
* devel
And that's it...
So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request?
If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time).
Thanks, Brian _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
-- Best Regards, Nick Knutov http://knutov.com ICQ: 272873706 Voice: +7-904-84-23-130 _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
_______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
this is meta. you can patch to submit a patch ! On Wed, Mar 23, 2011 at 3:59 PM, Flavio Poletti <polettix@gmail.com> wrote:
I think you can propose a patch for this as well:
https://github.com/sukria/perldancer-website/blob/master/views/contribute.tt
<https://github.com/sukria/perldancer-website/blob/master/views/contribute.tt> :-)
Cheers,
Flavio.
On Wed, Mar 23, 2011 at 3:42 PM, Brian E. Lozier <brian@massassi.com>wrote:
It occurs to me that it would be nice to have links to both of these pages on your contribute page:
http://perldancer.org/contribute
On Tue, Mar 22, 2011 at 6:17 PM, Nick Knutov <mail@knutov.com> wrote:
I'm also understand nothing about git, but http://advent.perldancer.org/2010/24 can help, I think.
On 23.03.2011 4:38, Brian E. Lozier wrote:
I wrote a tiny patch and I want to make a pull request on github. I'm confused as to how I'm supposed to be doing this because of a few things, but now mostly because I don't know how github works.
Originally I used the fork button on github to fork the Dancer project. That got me "master" I think. I made a change, committed it, pushed it back to the server, and then issued a pull request. This was a month ago or so. Then xsawyerx notified me that the pull request was approved and all was well until now when I have another patch. I made another patch on my same branch and issued another pull request, but it pulled in again the original change I had made, so it looks like it didn't detect (somehow, I'm not sure how this is supposed to work) that my original change had already been pulled in.
So I deleted my fork of the Dancer repo and started again with a new fork. I tried to follow the instructions here: http://help.github.com/fork-a-repo/ on forking and doing pull requests. After I forked I cloned to my local machine and then followed the instructions on "git remote add upstream" that would supposedly "track upstream" which I don't quite understand. When I did that it put me in the "devel" branch and my "master" branch disappeared. When I do git branch I get this list:
* devel
And that's it...
So I checked in my change and pushed this *devel branch and I want to do a pull request. Is this correct? What happens when/if my change is accepted? How do I make github not include it on the next pull request?
If I am doing something wrong please correct me. As you can tell I'm not very familiar with git and github (although I've been using cvs and svn for a really long time).
Thanks, Brian _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
-- Best Regards, Nick Knutov http://knutov.com ICQ: 272873706 Voice: +7-904-84-23-130 _______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
_______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
_______________________________________________ Dancer-users mailing list Dancer-users@perldancer.org http://www.backup-manager.org/cgi-bin/listinfo/dancer-users
-- franck cuny http://lumberjaph.net - http://github.com/franckcuny
participants (4)
-
Brian E. Lozier -
Flavio Poletti -
franck -
Nick Knutov