Closed t0dd closed 7 years ago
@t0dd you'll have to run git pull
or git fetch
to grab any updates that were made in order to correct the merge conflicts. Otherwise, that's an excellent resources to learn Ruby on Rails, I love Hartl's approach to teaching Rails!
A great and free RoR tutorial.