Pulling from Upstream only changes some files

mikeizbicki / cmc-csci046

CMC's Data Structures and Algorithms Course Materials

53 stars 153 forks source link

Pulling from Upstream only changes some files #286

Closed Michaelhess17 closed 3 years ago

Michaelhess17 commented 3 years ago

Hi Mike. I ran the following sequence of commands from my bst branch: $ git checkout -b avltree $ git pull upstream avltree And the pull was successful with no merge conflicts. It seems that the pull has updated my testBST.py file, and also downloaded the AVLTree.py file, but it surprisingly did not change my BST. py file (by introducing the __eq_\ method as expected). Do you have any idea why this would happen or what I should change to pull / merge the correct files?

Michaelhess17 commented 3 years ago

Oh my mistake. I see the __eq__ function in there. I must have just missed it.