I am starting to learn Git. I'm watching a video and learning from it. Right now I'm learning merge conflicts. I have a file in my GitHub repository and I have the same HTML file downloaded onto my laptop. To simulate a merge conflict, I edited on my local file (I added an extra !) and my GitHub file (I added an inline style).
I did the git pull command on my terminal and it says "You have divergent branches and need to specify how to reconcile them".
When I go back to my code in my laptop, I don't see the conflict markers the way the professor sees it in his file.
I don't know why this is happening. I googled it but I can't find an answer. I tried following the answer in this post, but it still doesn't work.
What do I do?