[Cuis] [github] Learning to use github....

[H. Hirzel]

This was done by
     git fetch upstream
     git merge upstream/master

(P.S. I write this mail partially as well for my own reference)

On 12/31/12, H. Hirzel <hannes.hirzel at gmail.com> wrote:
> Actually the short instructions on
> https://help.github.com/articles/fork-a-repo are very useful, though a
> bit terse.
>
> I just sucessfully merged Juan's updates from his master branch
> to my master branch.
>
> see https://github.com/jvuletich/Cuis/network
>
> --Hannes
>
>
>
> On 12/31/12, H. Hirzel <hannes.hirzel at gmail.com> wrote:
>> I am learning to use branches ....
>>
>> I did in my Windows Git bash shell
>>
>>     git checkout -b SimpleLogger
>>
>> This creates a new branch called 'SimpleLogger'  (
>> http://gitimmersion.com/lab_24.html ) and make the new branch active.
>>
>>   cd packages
>>   mkdir SimpleLogger
>>
>> Then I copied in the files from German which I got from
>> https://github.com/garduino/Cuis-SimpleLogger
>>
>>   cd ..
>>
>> and I did
>>   git add .
>>
>> git commit -m "created a branch SimpleLogger and added
>> https://github.com/garduino/Cuis-SimpleLogger"
>>
>> git push origin SimpleLogger
>>
>> The result may be inspected on
>>
>> https://github.com/hhzl/Cuis/
>>
>> It has two branches
>>
>> The branch 'SimpleLogger' has a subdirectory 'SimpleLogger' in the
>> 'packages' directory whereas 'master' does not.
>>
>> I think this is a way to port packages. Do the development in a branch
>> rather than in a separate github repository in a fork of
>> https://github.com/jvuletich/Cuis
>>
>>
>> --Hannes
>>
>>
>>
>>
>>
>>
>> On 12/31/12, Angel Java Lopez <ajlopez2000 at gmail.com> wrote:
>>> Yes, shared repository model is when you have many committers to the
>>> central repo. They can collaborate to accept and test pull requests,
>>> too.
>>> I
>>> suppose that is alike the Squeak trunk, but I don't know the details.
>>>
>>> On Mon, Dec 31, 2012 at 5:20 AM, H. Hirzel <hannes.hirzel at gmail.com>
>>> wrote:
>>>
>>>> Thank you Angel. This is helpful.
>>>>
>>>> As for now I changed the file README.md (fixes of the markdown so that
>>>> bullet lists show).
>>>>
>>>> I did in Git bash (under Windows 7) (recalling from memory as the
>>>> command line history is gone because of a restart)
>>>>
>>>> git add README.md
>>>>
>>>> git commit
>>>>
>>>> (I had an error message because user name / email was not set, the
>>>> instructions to do that were included)
>>>>
>>>> and then
>>>>
>>>>     git push origin master
>>>>
>>>>
>>>> whereas origin in this case is
>>>>     https://github.com/hhzl/Cuis
>>>>
>>>> I had set that earlier
>>>>
>>>> and
>>>>    master
>>>> is the main and only branch.
>>>>
>>>>
>>>> I had to struggle a bit with the vim editor which comes with the GIT
>>>> bash shell. But as I want to work on Linux as well I do not mind.
>>>>
>>>> Then I did a pull request on Github by pressing the 'Pull request'
>>>> button in the middle of the second row of https://github.com/hhzl/Cuis
>>>> at the top.
>>>>
>>>> I realize that I now should learn how to create a branch, so that the
>>>> change is done in a branch and not in the 'master' branch.
>>>>
>>>> Happy New Year 2013
>>>>
>>>> --Hannes
>>>>
>>>>
>>>>
>>>>
>>>> NOTE:
>>>> https://help.github.com/articles/using-pull-requests
>>>>
>>>> mentions two popular models
>>>>
>>>> * Fork & Pull
>>>> * Shared Repository Model
>>>>
>>>> It seems that 'Shared Repository Model' is equivalent to the Squeak
>>>> 'Trunk' approach?
>>>>
>>>> At the moment we have the 'Fork & Pull' model. And there seem to be
>>>> more
>>>> models.
>>>>
>>>>
>>>>
>>>>
>>>> On 12/30/12, Angel Java Lopez <ajlopez2000 at gmail.com> wrote:
>>>> > You can create a directory package.
>>>> >
>>>> > Then, from command line
>>>> >
>>>> > git status
>>>> >
>>>> > to see the changed files
>>>> >
>>>> > git add .
>>>> >
>>>> > to add all pending changed files to index (the pre-commit internal
>>>> > directory of git)
>>>> >
>>>> > git add -u
>>>> >
>>>> > to remove deleted files from git index
>>>> >
>>>> > then
>>>> >
>>>> > git commit -m "The message"
>>>> >
>>>> > I use the command line git (not the git bash), in Windows. There is a
>>>> > git.cmd in the program files git install directory, and I added that
>>>> > directory to my path, AFAIR
>>>> >
>>>> > On Sun, Dec 30, 2012 at 4:18 PM, H. Hirzel <hannes.hirzel at gmail.com>
>>>> wrote:
>>>> >
>>>> >> Hello
>>>> >>
>>>> >> I am still in the process of learning how to use github. I
>>>> >> understand
>>>> >> it allows for various kinds of setups and workflows.
>>>> >>
>>>> >> What I just did is
>>>> >>
>>>> >> 1) Installed git for Windows   http://msysgit.github.com/
>>>> >> 2) Used the 'git bash' command line interface. I think it is easier
>>>> >> to
>>>> >> use than the GUI in the end. The GUI is a bit confusing to me,
>>>> >> whereas
>>>> >> using the command line and following instructions like
>>>> >> https://help.github.com/articles/fork-a-repo is straightforward
>>>> >>
>>>> >> 3) I followed the instructions to clone my repository
>>>> >>     https://github.com/hhzl/Cuis
>>>> >>
>>>> >> I had forked recently from
>>>> >>
>>>> >>     https://github.com/jvuletich/Cuis
>>>> >>
>>>> >> Then I wanted to get the changes of Juan he did recently.
>>>> >>
>>>> >> So I did
>>>> >>
>>>> >>     git remote add upstream https://github.com/jvuletich/Cuis.git
>>>> >>
>>>> >>     git fetch upstream
>>>> >>
>>>> >>     git merge upstream/master
>>>> >>
>>>> >>
>>>> >> This gave me a local copy of the file
>>>> >>
>>>> >>    ListOfCuisPackages.md
>>>> >>
>>>> >> German and I had made in the last days and which Juan had added in
>>>> >> the
>>>> >> meantime to his repository.
>>>> >>
>>>> >> The next thing I would like to figure out how to add a subdirectory
>>>> >> 'packages' which is under the control of git and put external *.pck
>>>> >> files I have tested there.
>>>> >>
>>>> >> Regards
>>>> >> --Hannes
>>>> >>
>>>> >> _______________________________________________
>>>> >> Cuis mailing list
>>>> >> Cuis at jvuletich.org
>>>> >> http://jvuletich.org/mailman/listinfo/cuis_jvuletich.org
>>>> >>
>>>> >
>>>>
>>>> _______________________________________________
>>>> Cuis mailing list
>>>> Cuis at jvuletich.org
>>>> http://jvuletich.org/mailman/listinfo/cuis_jvuletich.org
>>>>
>>>
>>
>