WTF?
c1owni3 opened this issue · 4 comments
I got this message when I tried to make the final changes to heinola.html. What happened and how can this be fixed? I have no idea how to "debug the state of this repo"
It means that you should open terminal or console, go to directory of the project (command: cd path/to/project) and type command: git status
What did you get?
Ok, I don't know what just happened but I did something in GitHub and it seems that the problem got solved. :D Thanks anyway for your quick help :) I'm a total newbie with coding myself, so I just hope I didn't mess anything else up by doing that. I can see that there is so much to learn, but I'm so excited, and now, when our workshop in Heinola is over, I have time to learn more finally !! :)
I checked your commits just to be sure what happened and look at this commit: 79163bb
There was a conflict (two people edited the same lines of code) and github removed those lines, please check if this is what you wanted (file heinola.html, red background means that those lines were removed).
Yep, I removed those parts after I managed to commit & sync that previous situation somehow and they magically appeared after that :D Thank you so much for your help!