meeting
Meeting Date
Git is one of the leading distributed source code control systems. Originally developed to specifically help with workflows in the Linux kernel, git has seen rapid acceptance on a number of other projects due to it's flexibility and speed. Git takes a bit of education to use effectively, which this talk will hopefully provide.
The talk will cover some of the history of source code management to provide some context, then jump right into git workflows. The goal of the meeting is to have everyone feel comfortable with basic git commands by the end of the meeting, and hopefully introduce you to some of the more interesting and major features in git.
This meeting will be streamed live on ustream on the MHVLUG channel for those members of our community that can't attend the meetings directly.
Lightning Talks
- Matthias Johnson - iCloud
- Sean Dague - the new mhvlug.org
Presentation
Notes
Notable questions from the meeting (with answers as best as I can manage)
Q. What is git cherrypick?
A. Think of git cherrypick like git rebase. It just uses git to automate moving a patch to a different part of the tree.
Q. What parts of the tree get pushed on a push?
A. It depends on the configuration. By default the branches that you explicitly pushed in the past to that remote source will be pushed again in the future.
Q. How do you deal with a merge gone wrong?
A. The best thing to do when dealing with complex merges is to build a branch to do them in. Then if things go wrong you can just remove the branch and start again.
