On Sat, Jul 9, 2011 at 8:30 PM, Frank Bennett <[email protected]> wrote: > I'm still not in the swing of things with github. I recently made some > changes to a style, following the guidance note in README.md: > > *** > The preferred way to make contributions is to: > > 1. fork the main repository > 2. create a temporary development branch and make your changes there > 3. commit your changes in one atomic commit per style in the master branch > 4. issue a pull request to the main repository > *** > > The pull request was picked up, and the changes were published. Then > the original style author made some adjustments to the code, submitted > as a pull request which was also picked up and published. The master > repo is in good shape. > > Now I'm looking at the github fork I created, and I don't see any > means of pulling down the recent change submitted by the original > style author. There seem to be three possibilities: > > 1. I'm missing something, and all I have to do is press the right button; or > 2(a). There is no simple way to pull down changes from the origin to a > github fork, so the fork created for the edit should be thrown away > immediately after submitting the pull request; and > 2(b). I would do better to clone the repo master and handle git from > the command line instead, where this seems to be possible with "pull". > > Any guidance very welcome.
I think I may have hit the answer. The steps for sustained development in a personal fork seem to be: 1. fork the main repository 2. clone the fork to a local working copy, managed by a local github client of your choice 3. configure the local working copy to update from the original master, following the steps documented at http://help.github.com/fork-a-repo/ 4. create a temporary development branch and make your changes there 5. commit your changes in one atomic commit per style in the master branch 6. issue a pull request to the main repository 7. follow the steps documented at http://help.github.com/fork-a-repo/ or in the man or help pages of the local client to pull changes from the master repo as required Does that sound right? It sounds very complicated, but that seems to be what the docs say. > > Frank > ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ xbiblio-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/xbiblio-devel
