{"id":67,"date":"2018-09-28T10:07:27","date_gmt":"2018-09-28T14:07:27","guid":{"rendered":"http:\/\/sites.nd.edu\/crivaldi\/?p=67"},"modified":"2019-11-05T14:46:58","modified_gmt":"2019-11-05T18:46:58","slug":"git-version-control-and-reproducibility","status":"publish","type":"post","link":"https:\/\/sites.nd.edu\/crivaldi\/2018\/09\/28\/git-version-control-and-reproducibility\/","title":{"rendered":"Git – Version Control and Reproducibility"},"content":{"rendered":"

*Note to all users: As of 07\/14\/2019, all posts have been moved to (and are being updated at crivaldi.github.io . <\/a>I don’t have plans to shut this site down, but I have no idea how long it will be maintained by the university in the future.*<\/em><\/p>\n

 <\/p>\n

\"\"<\/p>\n

Welcome.<\/h1>\n

Everything is fine.<\/h1>\n

Git & github links\/instructions<\/h1>\n

Since we’re going to be using git for the rest of the semester to turn in assignments, we should get it down pretty good now.<\/p>\n

Here’s a nice explanation of git & github that uses an analogy of an author writing a book.<\/p>\n

https:\/\/blog.red-badger.com\/blog\/2016\/11\/29\/gitgithub-in-plain-english<\/a><\/p>\n

When git goes wrong:<\/p>\n

http:\/\/ohshitgit.com<\/a><\/p>\n

Resolve a conflict<\/h3>\n

https:\/\/help.github.com\/articles\/resolving-a-merge-conflict-using-the-command-line\/<\/p>\n

Turning in assignments – only one per pair\/group<\/h3>\n
    \n
  1. Complete the exercise on your local machine. Commit your changes.<\/li>\n
  2. Push your repo to your own github repository.<\/li>\n
  3. Go to the GitHub website and your own repository (which is a forked repo of my original repo).<\/li>\n
  4. Use “Pull Request” to turn in your assignment (upper middle of the screen, click “New Pull Request”<\/li>\n
  5. Make sure to type you and your collaborator’s name into the text box (ex: jones-rivaldi submission).<\/li>\n
  6. Click “Create Pull Request”<\/li>\n
  7. Done!<\/li>\n<\/ol>\n","protected":false},"excerpt":{"rendered":"

    *Note to all users: As of 07\/14\/2019, all posts have been moved to (and are being updated at crivaldi.github.io . I don’t have plans to shut this site down, but I have no idea how long it will be maintained by the university in the future.*   Welcome. Everything is fine. Git & github links\/instructions … Continue reading “Git – Version Control and Reproducibility”<\/span><\/a><\/p>\n","protected":false},"author":2790,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"footnotes":""},"categories":[29880,29881],"tags":[],"class_list":["post-67","post","type-post","status-publish","format-standard","hentry","category-unix","category-version-control-with-git"],"_links":{"self":[{"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/posts\/67","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/users\/2790"}],"replies":[{"embeddable":true,"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/comments?post=67"}],"version-history":[{"count":8,"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/posts\/67\/revisions"}],"predecessor-version":[{"id":174,"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/posts\/67\/revisions\/174"}],"wp:attachment":[{"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/media?parent=67"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/categories?post=67"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/sites.nd.edu\/crivaldi\/wp-json\/wp\/v2\/tags?post=67"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}