search

johnsogg / cs2270

CSCI 2270 - Data Structures & Algorithms - University of Colorado Boulder
46 stars 38 forks source link

Git Pull Issue #13

Open nnistler opened 11 years ago

nnistler commented 11 years ago

Hello, I was trying to do a git pull and got an error message not sure what to make of it or what to do. Please Help!

Thank You, Neil Nistler

error: Your local changes to the following files would be overwritten by merge: homeworks/hw-2-binary-search-trees/cpp/binary_search_tree.cpp

Please, commit your changes or stash them before you can merge.

Aborting

AThilenius commented 11 years ago

https://www.google.com/search?q=error%3A+Your+local+changes+to+the+following+files+would+be+overwritten+by+merge&oq=error%3A+Your+local+changes+to+the+following+files+would+be+overwritten+by+merge&aqs=chrome.0.57j58j62.825&sourceid=chrome&ie=UTF-8