Let's get together and plan to do things this year.

Let’s get together and go over solving some example merge conflicts with our favorite git ui. I’ll bring an example merge that creates conflicts and we’ll try to solve it. Maybe the best answer is the command line?

We’ll also discuss future topics like code retreats (testing) and refactoring. Come bring your ideas and wisdom!