Tag: Command Line

Conflict Resolution: Merging Conflicting Changes On GitHub

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

Module 3 Exercise 4: Text Mining With Stanford NER

Name Entity Recognition

Stanford Name Entity Recognizer (or Stanford NER) looks at patterns in metadata, and identifies and tags/labels words in a text which are the names of places, people, organizations, time, date, etc. The results can be extracted and visualized.

Dr. Graham recommended a very useful tutorial by Michelle Moravec on how to use Stanford NER and then extract results on a Mac. The tutorial also shows you how to organize the results into a categorized list ex: list by Location. At first I had an issue with running Stanford NER, the command line was telling me there was an issue with Java:

Continue reading

Module 2 Exercise 4.1: Scraping Data With Wget

Wget is a Tool for Downloading Internet Sources

The purpose of this Programming Historian Exercise was to help me get a sense of how to use wget to download a specific set of files, and how to download internet sources by creating a mirror of an entire website. For this exercise I decided to complete the section: “Step Two: Learning about the Structure of Wget – Downloading a Specific Set of Files.” In this exercise I ran wget through the command line to download the papers located in the active history website under the “features” tab. I was introduced to a series of useful commands for wget:

Continue reading

Git-It? Some GitHub Basics

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

css.php