On Wed, May 11, 2011 at 01:01:44PM +1000, Erik de Castro Lopo wrote: > > If there is a commit you want to throw away then just delete that line > > Ok, so I have a bunch of commits on my feature branch, now I > need to get them back upstream. Do I merge to the master > branch or do I push my feature branch to github and ask > upstream to pull from that?
I prefer to keep it in the feature branch otherwise if you end up working on multiple things at once, master will become a mishmash. So you need to push your feature to github. git co feature git push origin feature if you wanted local and remote branches to have different names git push origin feature_local:feature_remote Then on github on the page for this repository you should have a pull request button. When you click that you will probably need to select the branch you are requesting to be pulled. It will ask for a title and comment and might prefill some of that. That then notifies upstream and creates a "magic bug" that everyone can see and comment on. Cheers, John -- John Blog http://www.inodes.org LCA2012 http://lcaunderthestars.org.au _______________________________________________ coders mailing list coders@slug.org.au http://lists.slug.org.au/listinfo/coders
