Your SlideShare is downloading. ×
0
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Git single branch
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

Git single branch

908

Published on

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

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

Published in: Technology
0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
908
On Slideshare
0
From Embeds
0
Number of Embeds
1
Actions
Shares
0
Downloads
0
Comments
0
Likes
1
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide
  • \n
  • \n
  • \n
  • If this is your dev process - I can't help you\n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • There are other solutions - feel free to look yourself\n\n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • I don't mean that subtree is as hard as book binding - just as permanent\n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • Transcript

    1. Git and GitHub:Small team basics Carl Brown
    2. What is this talk about?Non-branching "straight-line" workflow for errorrecoveryBasic GUI tools (tiny bit of copy&paste commandline)Incorporating 3rd-party sources in a sane way
    3. What is this talk NOT about?Git internalsBranchingLarge or uncoordinated teams
    4. No substitutes for coordinationhttp://www.flickr.com/photos/chainsawpanda/3590745/sizes/o/in/photostream/
    5. Why? Lets 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 endshttp://www.flickr.com/photos/inside-south-africa/2504355339/sizes/z/in/photostream/
    8. and that it can benice to be able tofind your way back
    9. Raise your hand ifyouve fixed a bugwith multiple ⌘Zs? Be Honest...
    10. Are you people insane?
    11. So why git? These days, its literally MORE EFFORT to NOT use git.
    12. Why github?This means thatmost of the 3rd-partysource libraries liveon github.So learn it once, andleverage it.http://wiki.dandascalescu.com/essays/pita-threshold
    13. But...$$Not that expensiveMost single-shopcode might as wellbe open-sourcedanywayFeel free to skip thispart
    14. Theres more:Github has built asimple to use GUI*Greatly* simplifies githttp://mac.github.com
    15. Theres more: They have good tutorials
    16. DemoCreate 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 changesSync to GitHub
    30. 3rd Party Repos Incorporating Code only -Multiple static library dependencies is awhole other talk (and HARD in Xcode)
    31. Git SubmodulesIncorporate codeyou dont want toown(ships with Xcode)
    32. Git subtree As if the code was always yours (doesnt ship with Xcode)http://www.flickr.com/photos/nate/284184160/sizes/l/in/photostream/
    33. git submodule commandsSee Also: http://git-scm.com/book/en/Git- Tools-Submodules
    34. Find your repo
    35. Copy URL
    36. Add to Project
    37. Heres that againcd ${YOUR PROJECT}git submodule initgit 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. CommitLets you see all files
    43. Getting updatesAdd External/{Library} to Github appsync (one way) as normalCommit your repo after
    44. Local ModsEither make yourown forkOr copy file tochange to newfolder and moveXcode refDepends on ifchanges useful toother people or not
    45. DemoAdd new repo to project
    46. Further information
    47. Other GUIshttp://git-tower.com http://sourcetreeapp.com http://gitx.laullon.com
    48. WWDC 2012 Video
    49. Bookhttp://git-scm.com/book/

    ×