How to merge with conflicts

githubteacher / furry-computing-machine

demo and practice repo for 2.9's gh for everyone class

MIT License

3 stars 7 forks source link

Closed komalmathur closed 8 years ago

komalmathur commented 8 years ago

Can you show how to merge if there are conflicts Thanks

crichID commented 8 years ago

@komalmathur I know Patrick is planning to try to get to this during Q&A. Just in case, here are some resources for you: