emilyruzzo / solving-and-preventing-merge-conflicts Goto Github PK
View Code? Open in Web Editor NEWThis project forked from tatianatylosky/solving-and-preventing-merge-conflicts
An overview of how to solve internal Thinkful merge conflicts and use github best practices for the curriculum team or anyone who wants to contribute to Thinkful code.