Git merge micromaterial

Since I’m having fun with these software micromaterials, I thought I’d continue on with another simple one. Along with working on rebasing, resolving merge conflicts is another thing that learners new to git need to work on. If you want the longer explanation, you can go straight to the Github repository, but the short version is […]