[KyOSS Discuss] Tonight: Git workshop: part deux

alan blount alan at zeroasterisk.com
Thu Dec 13 14:09:23 EST 2012


Agreed - and the excellent directory/file differencer I was trying to
remember is Beyond Compare:

http://www.scootersoftware.com/moreinfo.php
http://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows


On Thu, Dec 13, 2012 at 11:54 AM, Chris Rockwell <chris at chrisrockwell.com>wrote:

> I agree, very good presentation.  Thank you for taking the time to put it
> together.
>
> I could not remember the name of the mergetool I have used on Windows -
> it's tortoisemerge: tortoisesvn.tigris.org/TortoiseMerge.html
>
> Also, regarding the line feeds in Windows, I had run into the same problem
> before but rather than changing the config files I quit creating patches in
> Dreamweaver and only did command line and Notepad++.  I never had an issue
> after that.
>
>
> On Thu, Dec 13, 2012 at 10:46 AM, Ben Senninger <bsenninger at yahoo.com>wrote:
>
>> Thanks Jeff and Alan for a great session on Git! Very informative and
>> helpful.
>>
>> Ben
>>
>>   ------------------------------
>> *From:* Christopher R Parrish <crparrish at insightbb.com>
>> *To:* The Kentucky Open Source Society Discussion List <
>> kyoss-discuss at kyoss.org>
>> *Sent:* Wednesday, December 12, 2012 7:11 PM
>> *Subject:* Re: [KyOSS Discuss] Tonight: Git workshop: part deux
>>
>> for the  ustream feed...
>> http://www.ustream.tv/channel/kyoss
>>
>> ------------------------------
>> *From: *"John Hicks" <johnhicks at kyoss.org>
>> *To: *kyoss-discuss at kyoss.org
>> *Sent: *Wednesday, December 12, 2012 4:50:45 PM
>> *Subject: *[KyOSS Discuss] Tonight: Git workshop: part deux
>>
>> Just a last-minute reminder about tonight's meeting/workshop on git,
>> presented by two pros: Jeff Squyres and Alan Blount.
>>
>> Pizza has been order and will be served at 6:30 (with chips and soda).
>> Program will begin promptly at 7 pm.
>>
>> Remember to bring your laptop, git installed, github account enabled, and
>> preferably having reviewed the slides from the October workhop (see Jeff's
>> OP below).
>>
>> Also, I see Alan has posted some materials for tonight's workshop on G+,
>> so I'll take the liberty of crossposting them here:
>>
>> Tonight's slides:
>> https://docs.google.com/presentation/d/1BqXBo58BVxzZXjtDBOE7Lcz8GOkvzWrF2RQ5NZQSIkg/edit
>>
>> Tonight's crib sheet: https://gist.github.com/4265044
>>
>> See you tonight!
>>
>>
>> John
>>
>>
>>
>> On 11/30/2012 10:18 AM, Jeff Squyres wrote:
>>
>> Due to popular demand, the Alan-and-Jeff roadshow returns to the KYOSS
>> December meeting for part 2 of the free Git workshop.  We'll continue
>> more-or-less where we left off last time, covering some more advanced
>> topics like branching, merging, and collaborating with others in a common
>> Git repository.
>>
>>  If you plan to attend:
>>
>>    - Bring your laptop (free wifi is provided at LVL1).  This is an
>>    interactive workshop.
>>    - Make sure you have read through the slides from part 1<https://docs.google.com/presentation/d/1TDnhh4aL3q2Gj_xCqji9pfDZ3abn4zkvLXOnkbCT6AU/edit#slide=id.p>
>>    .
>>    - Make sure you have a GitHub <https://github.com/> account.
>>    - Make sure your Git global config is setup (see the part 1 slides).
>>    - Have some git repo hosted on GitHub (anything -- it can even be a
>>    toy repository, or the one from the part 1).
>>
>>  See you in December!
>>
>>  --
>> {+} Jeff Squyres
>>
>>
>> _______________________________________________
>> KyOSS-Discuss mailing listKyOSS-Discuss at kyoss.orghttp://kyoss.org/cgi-bin/mailman/listinfo/kyoss-discuss
>>
>>
>>
>> _______________________________________________
>> KyOSS-Discuss mailing list
>> KyOSS-Discuss at kyoss.org
>> http://kyoss.org/cgi-bin/mailman/listinfo/kyoss-discuss
>>
>>
>> --
>> Chris Parrish
>>
>>
>> _______________________________________________
>> KyOSS-Discuss mailing list
>> KyOSS-Discuss at kyoss.org
>> http://kyoss.org/cgi-bin/mailman/listinfo/kyoss-discuss
>>
>>
>>
>> _______________________________________________
>> KyOSS-Discuss mailing list
>> KyOSS-Discuss at kyoss.org
>> http://kyoss.org/cgi-bin/mailman/listinfo/kyoss-discuss
>>
>>
>
>
> --
> Chris Rockwell
>
>
> _______________________________________________
> KyOSS-Discuss mailing list
> KyOSS-Discuss at kyoss.org
> http://kyoss.org/cgi-bin/mailman/listinfo/kyoss-discuss
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://kyoss.org/pipermail/kyoss-discuss/attachments/20121213/12db84eb/attachment.html>


More information about the KyOSS-Discuss mailing list