Demo merge conflicts, and how to resolve it - Githubissues

githubteacher / fluffy-octo-guacamole

demo and practice repo for May 2016 GitHub for Developers class

14 stars 15 forks source link

Demo merge conflicts, and how to resolve it #294

Open JohnAtCL opened 8 years ago