When done, submit here.

1

2

3

Get accounts and install software

Troubleshoot

[appname] can't be opened becuase it is from an unidentified developer.

Control-click on the file and choose 'Open', and you'll get an additional 'Open' option when the window pops up.

4

5

6

Links

7

8

9

10

Links

11

12

13

14

Links

Video

Troubleshoot

The video's not playing

Make sure you're in Google Chrome or Safari. IE and Firefox don't support HTML5 video with .mov files.

15

Video

16

Video

Code

➜  Desktop  cd ~/Documents/introHCI 
➜  introHCI  ls
LICENSE            Vagrantfile
introHCI-extras.sh README.md
cookbooks          lab1
➜  introHCI

17

18

Hints

What is ~/?

In Unix, ~/ is your home directory.

19

Video

Code

➜  Desktop  cd ~/Documents/introHCI
➜  introHCI ✗ git clone https://github.com/yourgithubusername/lab1.git
Cloning into 'lab1'...
remote: Counting objects: 537, done.
remote: Compressing objects: 100% (408/408), done.
remote: Total 537 (delta 92), reused 537 (delta 92)
Receiving objects: 100% (537/537), 3.66 MiB | 1.76 MiB/s, done.
Resolving deltas: 100% (92/92), done.
Checking connectivity... done
➜  introHCI git:(master) ✗

Troubleshoot

OS X: 

xcode-select: note: no developer tools were found at '/Applications/XCode.app', requesting install. Choose an option in the dialog to download the command line developer tools.

Then a popup asks you to choose 'get Xcode', 'Not Now', or 'Install'. Choose 'Install'. Once the install is done, try again.

OS X: 

Agreeing to the XCode/iOS license requires admin priveleges, please re-run as root via sudo.

As it suggests, add sudo to the front: 

sudo git clone https://github.com/yourgithubusername/lab1.git
Scroll through the license, and agree at the bottom. Another path would be to open Xcode and agree to the license there.

Windows: how do I paste into Git Bash?

Click on the terminal icon in the upper left of the window: Edit, Paste. For a shortcut: Alt-spacebar, then e, then p. If that seems needlessly complicated, you can also enable QuickEdit mode by clicking on the terminal icon in the upper left of the window: Defaults(or Properties). Go to the Options tab and enable "QuickEdit Mode". Now you may paste by right-clicking in the terminal.

20

21

Video

Code

<!doctype html>

<html>
<head>
  <meta charset="utf-8">
  <title>HCI Project Portfolio</title>
</head>

<body>
  <!-- this is a comment in HTML -->
  <h1>Scott Klemmer</h1> <!-- h1 through h5 are headers. The higher the number, the smaller the header -->
  <h4>Project Portfolio</h4>

  <!-- p means paragraph -->
  <p>Scott Klemmer is an associate professor of Cognitive Science and Computer Science & Engineering at UC San Diego.</p>

  <h4>Projects</h4>
  <ol>
    <li>Waiting in line</li>
    <li>Needfinding</li>
    <li>Prototyping</li>
    <li>...</li>
  </ol>
</body>
</html>

22

23

Code

# No response means it succeeded. 
git config --global user.name "Your Name"
git config --global user.email "youremail@university.edu"
git config --global push.default simple

Video

24

25

Video

Code

➜  lab1 git:(master) ✗ git status
# On branch master
# Changes not staged for commit:
#   (use "git add ..." to update what will be committed)
#   (use "git checkout -- ..." to discard changes in working directory)
#
#    modified:   static/index.html
#
no changes added to commit (use "git add" and/or "git commit -a")
➜  lab1 git:(master) ✗ git add static/index.html 
➜  lab1 git:(master) ✗ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD ..." to unstage)
#
# modified:   static/index.html
#
➜  lab1 git:(master) ✗

Troubleshoot

fatal: Not a git repository (or any of the parent directories)

Make sure that you're in the lab1 directory --- this command only works within a directory that is a git repository

26

Video

Code

➜  lab1 git:(master) ✗ git commit -m "Replaced default information in web page"
[master f283015] Replaced default information in web page
 1 file changed, 2 insertions(+), 2 deletions(-)
➜  lab1 git:(master) git pull
Already up-to-date.
➜  lab1 git:(master) git push
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 485 bytes | 0 bytes/s, done.
Total 4 (delta 2), reused 0 (delta 0)
To https://github.com/mbernst/lab1.git
   1180cca..f283015  master -> master

Troubleshoot

Git asks me for my password but it's not showing up

Command line terminals typically don't show your password or any ****s while you're typing it. Don't worry, just keep going and press enter at the end. Likewise, if you paste the password into the terminal, you won't see anything. Don't worry, the terminal got the message.

git-credential-osxkeychain died of signal 11

If you're willing to enter your password every time you push to git, you can run sudo rm /usr/local/git/etc/gitconfig. That's a pretty huge sledgehammer for this problem, though. StackOverflow has more solutions.

When running git commit, git says: 

On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
modified: static/index.html

no changes added to commit

Make sure you've done the git add step from the previous slide.

27

Troubleshoot

Your submission URL will be of the form:

 

https://github.com/{YOUR_USER_NAME}/lab1

28

29

30

31

Video

Code

➜  lab1 git:(master) git remote add conflict https://github.com/IntroHCI/lab1conflict.git
➜  lab1 git:(master) git pull conflict master
 remote: Counting objects: 11, done.
 remote: Compressing objects: 100% (6/6), done.
 remote: Total 8 (delta 4), reused 0 (delta 0)
 Unpacking objects: 100% (8/8), done.
 From https://github.com/IntroHCI/lab1conflict
  * branch            master     -> FETCH_HEAD
 Auto-merging static/index.html
 CONFLICT (content): Merge conflict in static/index.html
 Automatic merge failed; fix conflicts and then commit the result.

Troubleshoot

I made a mistake typing in the address for 

git remote add conflict https://github.com/IntroHCI/lab1conflict.git
Now when I try to git remote add conflict again it says 
fatal: remote conflict already exists

run git remote rm conflict to remove the bad address

32

Video

Code

<html>
<head>
  <meta charset="utf-8">
  <title>HCI Project Portfolio</title>
</head>

<body>
  <!-- this is a comment in HTML -->
  <h1>Scott Klemmer and John Hennessy</h1> <!-- h1 through h5 are headers. The higher the number, the smaller the header -->
  <h4>Project Portfolio</h4>

  <!-- p means paragraph -->
  <p>Scott Klemmer is an associate professor of Cognitive Science and Computer Science & Engineering at UC San Diego. John Hennessy is president of Stanford University and enjoys taking HCI classes in his spare time.</p>

  <h4>Projects</h4>
  <ol>
    <li>Waiting in line</li>
    <li>Needfinding</li>
    <li>Prototyping</li>
    <li>...</li>
  </ol>
</body>
</html>

33

Video

Code

➜  lab1 git:(master) ✗ git add static/index.html 
➜  lab1 git:(master) ✗ git commit -m "fixing merge conflict"
[master 766d49f] fixing merge conflict
➜  lab1 git:(master) git pull
Already up-to-date.
➜  lab1 git:(master) git push
Counting objects: 22, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (16/16), 1.45 KiB | 0 bytes/s, done.
Total 16 (delta 8), reused 0 (delta 0)
To https://github.com/mbernst/lab1.git
   f283015..766d49f  master -> master

34

35

36

37

38

39

40

Links

41

42

43

44

45

46

47

48

49

When done, submit here.