githubteacher / github-for-developers

practice repo for Nov 24 - 25 class
1 stars 7 forks source link

can we do merge through command line? #125

Closed srivas2 closed 8 years ago

patrickmckenna commented 8 years ago

@srivas2 Yup, and we'll be covering that as we go over resolving merge conflicts.