Git/GitHub conflict resolution
I keep forgetting how to resolve conflicts in git. This stackoverflow question seems to explain things quite nicely. If there is a conflict git puts some lines in the conflicting file highlighting the conflict. You can open that file manually resolve the conflict. Manually resolving the conflict means editing the file to leave it as… Read More »