See full event listing

#gitPanic - Merging and Rebasing

You can commit and push changes, but what if other developers are working in the repo at the same time as you? How do you add changes from one branch to another? What the heck is interactive rebasing? We’ll cover squashing, cherry-picking, resolving conflicts, the difference between merging and rebasing, and more!

Abbey Perini is many things - a metro Atlanta native, a person of many hobbies, and a full-stack web developer. She loves blogging about fun and useful things about programming. You can find her work and ways to connect with her at


More Awesome Sessions