search

mikeizbicki / cmc-csci046

CMC's Data Structures and Algorithms Course Materials
54 stars 154 forks source link

Conflicting Files #400

Closed FallynB closed 1 year ago

FallynB commented 1 year ago

Hi Mike,

As I was trying to submit a pull request for step 4, I received the error below. I believe it was sue to a spelling inconstancy between your version of a file and my version. It was the one that we worked on during class. What is the general rule for fixing issues such as this?

Screenshot 2023-01-24 at 8 36 12 AM
mikeizbicki commented 1 year ago

We will cover the proper way to fix this problem in one of the next class sessions. A temporary work around is to delete your fork (on both the lambda server and github) and restart.