Tag: GitHub

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

Reflection

As I look back at my progression through the course, I realize how far I have come. When I began this course, my digital experience was limited to downloading music and using social media. Naturally, I found this course and its content extremely overwhelming at first. However, from the beginning of the course, Dr. Graham was there to provide guidance and assistance whenever I had a problem. And through Slack, I was also able to communicate with other classmates and our TA to work through any issues and solve them.

Continue reading

Module Module 1 Exercise 4: Fork And Contribute On GitHub

Following the instructions, I successfully forked the who-we-are repository, cloned it to my desktop, made the appropriate changes to the template file. I included a link to my Twitter page, Open-Notebook- and blog, then made a pull request so that my information could be included in the original repository. I did not have any difficulty with this exercise, I find Github easier to use and make sense of since completing the Git-It tutorial. Practicing forking and making pull requests in the Git-It tutorial was extremely helpful for completing this exercise.  This exercise was good practice for writing with Markdown, and for navigating and contributing to Github. For my melissanelson.md file, which was added to the repository, I also included an Adventure Time GIF that I really like. I wonder if there is a way to post GIFs and videos to stream directly on your Github page.

Continue reading

Module 1 Exercise 3: Creating A Personal GitHub Repository

So for this exercise, I created an “open-notebook-” repository on my online GitHub, but I needed to sync it to my GitHub desktop. I ran into a problem while trying to do this. My GitHub desktop was stuck on “tutorial” mode and would let me add branches and would save that work, but would not let me exit tutorial and show me my files even though I was logged in. I had completed the tutorial, and turned to Google for help to see if anyone else had this issue but I couldn’t find a solution for it. So I asked Dr. Graham for help. He helped me clone my “open-notebook-” file to my GitHub desktop and told me that I can still work on the system without getting rid of the tutorial repository. We tested it out by creating test.md file with the commit message “working with Dr. Graham,” synced the file and saw that it went to my online GitHub so the Local and Remote repositories are connected.

Continue reading

Module 1 Exercise 1: Learn Markdown With Dillinger

When I started this exercise, I had never heard of Dillinger or Markdown syntax, so this was the first time I have ever created a markdown file to format plain text. I used the guidelines from Sarah Simpkin The Programming Historian. I had issues because I found the examples on the Programming Historian page did not specify where spaces should and should not go when entering URL in markdown to get reference style links and in text images. Which made a difference when trying to get links and images to show on dillinger properly. So I had to play around with it a bit to get the links to turn out how I needed them to. As for the images, I was entering the URL in the correct format but the dillinger page was not showing my images, instead it showed a box with the name I had given my images.

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 coding, 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

Open Access Please: The Importance of “Open” Notes & Research Data

Why Is “Openness” Useful?

Historians are not accustomed to sharing research notes and data with the public. Traditionally, research publications are shared for the education of the public, while the research process is left outside of the public’s view. More recently however, historians have began to create “openness” in research through producing open notebooks, and providing open access to research data. Creating an open notebook is the process of releasing free research notes to the public online.  With the rise of digital technology, blogging platforms and code hosting sites, such as  GitHub, allow historians to easily share their research notes with other researchers and document the progress of their projects. This allows other researchers to learn from the methods, failures, and results which moved a research project forward. Likewise, providing the public with open access to one’s research data grants other researchers access to information which otherwise would have been more difficult, or time consuming, to access.

Continue reading

css.php