Assignment #2
This assignment tests your understanding of XHTML and CSS for layout, positioning, and the CSS box model. Please secure it using your .htaccess file from Assignment 0 (as long as you haven't done anything to turn it off, this password should still be working).
Git Setup
The files you need for this assignment have been uploaded to the class repository. They have been pushed to the master branch, so this is how to include them into your specific branch. On your machine, you'll do the following
$ ssh -i ~/.ssh/keyfile.pem ec2-user@ec2-XX-XX-XX-XX.compute-1.amazonaws.com
__| __|_ )
_| ( / Amazon Linux AMI
___|\___|___|
cd /var/www/html
git pull origin master
- at this point, you'll either see VIM open with something like the following (meaning it went cleanly, and you're good to go)
1 Merge branch 'master' of github.com:RocHCI/CSC210 into Firstname-Lastname 2 3 * 'master' of github.com:RocHCI/CSC210: 4 added files for assigment 2 5 6 # Please enter a commit message to explain why this merge is necessary, 7 # especially if it merges an updated upstream into a topic branch. 8 # 9 # Lines starting with '#' will be ignored, and an empty message aborts 10 # the commit.
just press [Escape] followed by :wq to close VIM and write your merge commit.
- or you'll see something like this.
which tells you that there was a conflict on some files. (That usually means you edited a file that someone else edited as well. We're going to need to fix these conflicts.remote: Counting objects: 11, done. remote: Compressing objects: 100% (9/9), done. remote: Total 9 (delta 0), reused 9 (delta 0) Unpacking objects: 100% (9/9), done. From github.com:RocHCI/CSC210 * branch Alex-Silverman -> FETCH_HEAD Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.
git status
# Unmerged paths:
# (use "git add ..." to mark resolution)
#
# both modified: ../index.html
is a great command to keep around. Any file in the Unmerged Paths section will have to be inspected manually. Here's how to resolve a merge conflict.
vi ../index.html
<<<<<<< HEAD
2
...
38