*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

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.

Here’s a nice explanation of git & github that uses an analogy of an author writing a book.

https://blog.red-badger.com/blog/2016/11/29/gitgithub-in-plain-english

When git goes wrong:

http://ohshitgit.com

Resolve a conflict

https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

Turning in assignments – only one per pair/group

1. Complete the exercise on your local machine. Commit your changes.
2. Push your repo to your own github repository.
3. Go to the GitHub website and your own repository (which is a forked repo of my original repo).
4. Use “Pull Request” to turn in your assignment (upper middle of the screen, click “New Pull Request”
5. Make sure to type you and your collaborator’s name into the text box (ex: jones-rivaldi submission).
6. Click “Create Pull Request”
7. Done!