About Catherine Devlin

Feb 5, 2015 • Catherine Devlin

Catherine Devlin is a Python programmer and database administrator for 18F. In an earlier century, she was a Minnesotan and a chemical engineer, but today she lives in Dayton, Ohio. She was the first chair of PyOhio and has taught four rounds of the Midwest Python Workshop for Women.

What I found hardest about using Git the first time was… manually resolving merge conflicts. It was horrifying to have git write all sorts of difficult-to-understand garbage into my files, and leave me in a mysterious state where I just wanted to go back to where I was before the merge (but I didn’t even know how to do that).