Presentation for KUDOS conference in Madison, WI, May 2-3, 2011

1. Git 101 Or, How to sanely manage your Koha customizations

3. Lead Development Specialist at ByWater Solutions

4. Koha 3.6 QA Manager

5. Geek

6. What is Git? Git is a free and open source distributed version control system invented by Linus Torvalds (the Linux guy).

8. Manages content, not files

9. Multiple development lines can be followed concurrently

11. Index: the current file contents you have

12. Commit: a saved change to the Index

13. Branch: a chain of Commits

14. Checkout: to choose a Commit, and load the Index associated with it

15. Patch: a Commit formatted as a file (for sending to others)

16. Repository Structure bard dug kat bard dug cat bird dog cat rat bird dog cat

17. Branch Structure HEAD master branch1 master branch2 branch3 HEAD HEAD HEAD merge merge

18. Bad repo v. Good repo

19. That's great... Howz this aply to me? Huwz this aply to me?

21. Cloning the Koha repository

22. Making a branch

23. Committing a change

24. Submitting a patch

25. Updating your repository

26. Signing off on others' patches

28. On Ubuntu: sudo apt-get install git git-email

29. On Mac OSX: download git-osx-installer ( http://code.google.com/p/git-osx-installer/ )

30. On Windows: Don't.

32. git config --global user.email "your@mail.com"

33. Other configs are possible. All stored in: .gitconfig

35. Wait...

36. cd kohaclone

38. Show current branch and other info: git status

39. Create your branch: git checkout -b mybranch master

41. Talk to your patrons

42. FILE A BUG REPORT!!! on http://bugs.koha-community.org

43. Bigger idea? Post an RFC on http://wiki.koha-community.org

44. Making a Change

46. Or, more lazily: git commit -a

47. Write your commit message. It should begin with the bug number, then a brief one-line description of the bug.

49. You'll see something like “0001-BugXXXX--....fix.patch”

50. git send-email -to koha-patches@lists.koha-community.org “0001-BugXXXX--....fix.patch”

52. For bigger developments, post an RFC to the wiki with detailed functionality

53. After emailing patch, attach the patch to the bug report and label bug “needs signoff”

54. After signing off, label bug “signed off”. If the patch isn't attached to the bug report, do it now

56. Easy to fetch an attached patch:

57. wget -O bugXXXX.patch http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=YYYY

59. Someone in the community tests and signs off

60. Quality Assurance Manager tests, and signs off

61. Release Manager commits to Koha

63. git pull

64. git checkout mybranch

65. git rebase master

66. You may need to deal with merge conflicts... Submit Early and Submit Often

68. TEST TEST TEST

69. git commit –-amend change the first line of the commit message to begin with [SIGNED-OFF]

70. git format-patch -s master

71. git send-email ...

72. Course Complete! I can haz diploma? Teh sink ate yurs

74. Log on to Koha IRC: we're here to help!