A student trying to understand how computers work. FYI apologies in advance for the terrible writing.
What are Git merge conflicts