Yo, So, in testing github out, I: 1. Forked openlayers/openlayers. (I did this a week ago) 1a. Since my fork was out of date, I did: git pull g...@github.com:openlayers/openlayers.git master git push To update my fork. 2. Made some changes in my fork, and pushed them 3. In my checkout of openlayers/openlayers (ol3), I did: $ git pull g...@github.com:crschmidt/openlayers.git $ git push To push the changes into the main OL repository. 4. Looking back at the history, I saw that Cedric/fredj did some other work I was interested in having in trunk, so I pulled that into ol3 as well:
$ git pull git://github.com/cedricmoullet/openlayers.git master $ git push The end result is that I think all the branches (except Fredj's most recent work, which I figure he can handle on his own) should be in the 'master' git repo. Is this right? Other than a failed attempt at a local revert when I screwed something up (see e496d6929c497f8e2f18 / 686c499668bdbe04f50a ) is there anything I did wrong, or shouldn't do again? Regards, -- Christopher Schmidt Nokia _______________________________________________ Dev mailing list Dev@openlayers.org http://openlayers.org/mailman/listinfo/dev