learning-git This is a sample repository to learn the intermediate basics of git I am adding an edit in order to create an unstaged change. I'm editing this line to create a merge conflict.