Uploaded byCarl Brown
Git single branch
The talk by Carl Brown focuses on utilizing Git and GitHub for small team software development, emphasizing a straightforward, non-branching workflow for error recovery and the integration of third-party sources. It discusses basic GUI tools and the simplicity of Git and GitHub, particularly for managing dependencies and version control. The presentation does not cover Git internals, branching, or coordination strategies for larger teams.
More Related Content
Git single branch
- 1. Git and GitHub: Smallteam basics Carl Brown
- 2. What is thistalk 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 thistalk NOT about? Git internals Branching Large or uncoordinated teams
- 4. No substitutes forcoordination 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.
- 7.
- 8. and that itcan be nice to be able to find your way back
- 9. Raise your handif you've fixed a bug with multiple ⌘Zs? Be Honest...
- 10. Are you peopleinsane?
- 11. So why git? These days, it's literally MORE EFFORT to NOT use git.
- 12. Why github? This meansthat 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 Mostsingle-shop code might as well be open-sourced anyway Feel free to skip this part
- 14. There's more: Github hasbuilt 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 inXcode
- 18.
- 19.
- 20.
- 21.
- 22.
- 23.
- 24.
- 25.
- 26.
- 27.
- 28.
- 29. Demo Make changes Syncto 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 youdon'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.
- 35.
- 36.
- 37. Here's that again cd${YOUR PROJECT} git submodule init git submodule add ${library_url} External/{lib_name}
- 38. Now, Add toXcode
- 39.
- 40.
- 41. Add the libsource
- 42. Commit Lets you seeall files
- 43. Getting updates Add External/{Library}to Github app sync (one way) as normal Commit your repo after
- 44. Local Mods Either makeyour 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 repoto project
- 46.
- 47. Other GUIs http://git-tower.com http://sourcetreeapp.com http://gitx.laullon.com
- 48.
- 49.
Editor's Notes
- #2 \n
- #3 \n
- #4 \n
- #5 If this is your dev process - I can't help you\n
- #6 \n
- #7 \n
- #8 \n
- #9 \n
- #10 \n
- #11 \n
- #12 \n
- #13 \n
- #14 There are other solutions - feel free to look yourself\n\n
- #15 \n
- #16 \n
- #17 \n
- #18 \n
- #19 \n
- #20 \n
- #21 \n
- #22 \n
- #23 \n
- #24 \n
- #25 \n
- #26 \n
- #27 \n
- #28 \n
- #29 \n
- #30 \n
- #31 \n
- #32 \n
- #33 I don't mean that subtree is as hard as book binding - just as permanent\n
- #34 \n
- #35 \n
- #36 \n
- #37 \n
- #38 \n
- #39 \n
- #40 \n
- #41 \n
- #42 \n
- #43 \n
- #44 \n
- #45 \n
- #46 \n
- #47 \n
- #48 \n
- #49 \n
- #50 \n