Currently, I do not own a personal computer so I often used a computer which was available in the history department to complete the exercises for Crafting Digital History. When I did not have access to that computer, I would use my iPad to make changes to my remote GitHub notes. However, there were times when I forgot to pull these changes to my text editor once I was using the computer again. As a result, when I attempted to sync changes from local to remote I caused a merge conflict. There is more than one way a merge conflict can occur, in my case, I created an edit conflict. This is the most common type of conflict, and it occurs whenever two branches change the same part of a repository, and then attempt to merge both changes together. As a result, Git does not know which change to use, and asks for you to “resolve the conflict” to clarify which change your want to keep.Continue Reading "Conflict Resolution: Merging Conflicting Changes On GitHub"
What Is GitHub?
I started using GitHub for my Crafting Digital History course for the first time this year. At the time, I had never heard of GitHub, and I found its terminology and commands difficult to understand. However, once you download all the necessary software and begin using its commands, it is quite simple to use. It is also useful to learn, as social coding through GitHub has become increasing popular, and currently the site is home to more than 5 million open source projects.Continue Reading "Git-It? Some GitHub Basics"