Skip to content

Latest commit

 

History

History
136 lines (78 loc) · 3.95 KB

02_git.md

File metadata and controls

136 lines (78 loc) · 3.95 KB
Raw

Git/GitHub Assignment

  • INDIVIDUAL ASSIGNMENT
  • Deadline: Sept-08
  • How to submit: For each empty grey box, please provide with an answer to the item in a document. Do the following to submit the Part 1 of your assignment:
  1. Use the repo you created for Assignmen1 (INF502);
  2. create a file called "Assignment2.md" and paste your answers there (tip: click on "Raw" at the right-top of this file to get the markdown source);

For Part 2 the pull request created will the submission (except for item 4, which you need to add to the end of the Assignemnt1.md).

  • Value: Part of homework grade

Description

This assignment is composed of two parts.

  • Part 1 consists of executing a sequence of commands and giving explanations about the commands you have to run. For each item in the assignment, please provide appropriate explanation and/or the details requested.
  • Part 2 consists of creating a Markdown file on a fork of this course and creating a pull request towards this repo.

Part 1: Dealing with git

To conduct this, you will have to download handson.zip and unzip it. handson folder is a git repository. Using the command line change the directory to "handson/"

The empty boxes

represent the content you need to fill and post on your private repository

  1. Describe what is the output of the following commands
    • git branch
    • git checkout BRANCH_NAME (USE THE NAME OF AN EXISTING BRANCH)
    • git log --decorate
  1. Try git log --graph --all. What do you see?
  1. Use git diff BRANCH_NAME to view the differences from a branch and the current branch. Summarize the difference from master to the other branch.
  1. Write a command sequence to merge the non-master branch into master
  1. Write a command (or sequence) to (i) create a new branch called math (from the master) and (ii) change to this branch (yes, math is already there, just report what you've done, the error and the reason you got the error. If you deleted and recreated the branch, you are fine too)
  1. Edit B.py adding the following source code below the content you have there
print 'I know math, look:'
print 2+2
  1. Write a command (or sequence) to commit your changes
  1. Change back to the master branch and change B.py adding the following source code (commit your change to master):
print 'hello world!'
  1. Write a command sequence to merge the math branch into master and describe what happened
  1. Write a set of commands to abort the merge
  1. Now repeat item 9, but proceed with the manual merge (Editing B.py). All implemented functions are needed. Explain your procedure
  1. Write a command (or set of commands) to proceed with the merge and make master branch up-to-date

Part 2: Using GitHub

The goal of this assignment is to put you in touch with the fork-pullrequest process, with an extra of dealing a little bit with Markdown. To learn more about Markdown click here.

You must fork this repo and submit a pull request back

  1. Into the students folder, create a file called LASTNAME_FIRSTNAME.md (please change LASTNAME_FIRSTNAME for your actual last and first names).
  2. Use Markdown to structure the following information about the last paper you've read (you can structure your markdown the way you want):
  • Title
  • Venue (journal name/conference)
  • Number of pages
  • 3 outcomes of the paper
  • link to the paper online

  1. Send your file back to this repository until creating a pull request (your pull request needs to appear here).

  2. Report your experience of making this submission, including the steps followed, commands used, and hurdles faced (within the file you created for the Part 1.