i'm on chapter 5 of michael hartl's "ruby tutorial". tried merge branches, on wrong branch , took myself down rabbit hole. i've got pretty far out of way after doing backtracking issue again.
****captains-imac:sample_app owner$ git pull origin master u app/views/layouts/application.html.erb u app/views/static_pages/home.html.erb u config/routes.rb u test/controllers/static_pages_controller_test.rb pull not possible because have unmerged files. please, fix them in work tree, , use 'git add/rm <file>' appropriate mark resolution , make commit.**** the master branch 1 correct me. pointers complete newbie?
one thing use git checkout <file> check out committed version of file (thus discarding changes), or git reset --hard head throw away uncommitted changes files.
warning: latter discard of local changes. if not particularly care changes made locally.
otherwise, encourage check out excellent post, author of accepted answer goes in depth sort of problem experiencing right now.
hope helps out.
Comments
Post a Comment