Presentation from the Austin CocoaCoder.org meeting about working with git and github in Xcode for solo developers or small teams.

1. Git and GitHub:
Small team basics
Carl Brown

2. What is this talk
about?
Non-branching "straight-line" workflow for error
recovery
Basic GUI tools (tiny bit of copy&paste command
line)
Incorporating 3rd-party sources in a sane way

3. What is this talk NOT
about?
Git internals
Branching
Large or uncoordinated teams

4. No substitutes for coordination
http://www.flickr.com/photos/chainsawpanda/3590745/sizes/o/in/photostream/

5. Why?
Let's agree that
building software is
like a journey...
http://www.flickr.com/photos/ghazzog/2607501537/sizes/l/in/photostream/

6. ...with forks...
http://www.flickr.com/photos/simonsterg/4194538607/sizes/l/in/photostream/

7. ...and dead ends
http://www.flickr.com/photos/inside-south-africa/2504355339/sizes/z/in/photostream/

8. and that it can be
nice to be able to
find your way back

9. Raise your hand if
you've fixed a bug
with multiple ⌘Zs?
Be Honest...

10. Are you people insane?

11. So why git?
These days, it's
literally MORE
EFFORT to NOT use
git.

12. Why github?
This means that
most of the 3rd-party
source libraries live
on github.
So learn it once, and
leverage it.
http://wiki.dandascalescu.com/essays/pita-threshold

13. But...$$
Not that expensive
Most single-shop
code might as well
be open-sourced
anyway
Feel free to skip this
part

14. There's more:
Github has built a
simple to use GUI
*Greatly* simplifies git
http://mac.github.com

15. There's more:
They have good
tutorials

16. Demo
Create new project
Add to Github

17. Using git in Xcode

18. Committing

19. Modifications?

20. Commit changes

21. Enter Message

22. Source Control View

23. Click Here:

24. File Revisions

25. Changes

26. Blame

27. Log/History

28. Sync with GitHub

29. Demo
Make changes
Sync to GitHub

30. 3rd Party Repos
Incorporating Code only -
Multiple static library dependencies is a
whole other talk (and HARD in Xcode)

31. Git Submodules
Incorporate code
you don't want to
own
(ships with Xcode)

32. Git subtree
As if the code was
always yours
(doesn't ship with
Xcode)
http://www.flickr.com/photos/nate/284184160/sizes/l/in/photostream/

33. git submodule
commands
See Also: http://git-scm.com/book/en/Git-
Tools-Submodules

34. Find your repo

35. Copy URL

36. Add to Project

37. Here's that again
cd ${YOUR PROJECT}
git submodule init
git submodule add ${library_url}
External/{lib_name}

38. Now, Add to Xcode

39. Add New Group

40. Pick Add Files

41. Add the lib source

42. Commit
Lets you see all files

43. Getting updates
Add External/{Library} to Github app
sync (one way) as normal
Commit your repo after

44. Local Mods
Either make your
own fork
Or copy file to
change to new
folder and move
Xcode ref
Depends on if
changes useful to
other people or not

45. Demo
Add new repo to project

46. Further information

47. Other GUIs
http://git-tower.com http://sourcetreeapp.com
http://gitx.laullon.com

48. WWDC 2012 Video

49. Book
http://git-scm.com/book/