<commit_before><!doctype html>
<html lang="en">

	<head>
		<meta charset="utf-8">
		<title>Design with the user: Version Control Systems</title>
		<meta name="apple-mobile-web-app-capable" content="yes" />
		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

		<link rel="stylesheet" href="css/reveal.min.css">
		<link rel="stylesheet" href="css/theme/supsi.css" id="theme">
		<link href='http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
		<link href='http://fonts.googleapis.com/css?family=Fjalla+One' rel='stylesheet' type='text/css'>
		
		<link rel="icon" href="http://www.maind.supsi.ch/Master_Interaction_Design-favicon.jpg" type="image/x-icon" />
                <link rel="shortcut icon" href="http://www.maind.supsi.ch/Master_Interaction_Design-favicon.jpg" type="image/x-icon" />
		
		<!-- For syntax highlighting -->
		<link rel="stylesheet" href="lib/css/zenburn.css">

		<!-- If the query includes 'print-pdf', use the PDF print sheet -->
		<script>
			document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
		</script>

		<!--[if lt IE 9]>
		<script src="lib/js/html5shiv.js"></script>
		<![endif]-->
	</head>

	<body>

		<div class="reveal">

			<!-- Any section element inside of this container is displayed as a slide -->
			<div class="slides">

				<section>
					<h1>Design with the user</h1>
					<h3>05 December 2013</h3>
				</section>
				
				<section>
					<h3>1. Git</h3>
					<h3>2. GitHub</h3>
				</section>
				
				<section>
					<h1>1. Git</h1>
				</section>
				
				
				
<section>
					<h2>Git: workflow of a file</h2>
					<a href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">
					<img src="images/git-file-workflow.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: workflow</h2>
					<a href="http://commons.wikimedia.org/wiki/Category:Git">
					<img src="images/gitflow.jpg">
					</a>
					<p class="source">Source: <a href="http://commons.wikimedia.org/wiki/Category:Git">http://commons.wikimedia.org/wiki/Category:Git</a></p>
				</section>

				<section>
					<h2>Using Git locally (01): start</h2>
					<pre><code data-trim class="python">
					cd &lt;directory name&gt; #Enter into the project directory
					</code></pre>
					<pre><code data-trim class="python">
					git init #Start local repository
					</code></pre>
					<pre><code data-trim class="python">
					git status #Get status of the working directory/stage
					</code></pre>
					<pre><code data-trim class="python">
					git add &lt;file name&gt; #Add a file to the stage
					</code></pre>
					<pre><code data-trim class="python">
					git add . #Add all files from current directory to the stage
					</code></pre>
					<pre><code data-trim class="python">
					git add -a :/ #Add all files recursively
					</code></pre>
					<pre><code data-trim class="python">
					git add -u #Update (add) all files already being tracked
					</code></pre>
					<pre><code data-trim class="python">
					git commit -m "messagetext" #Commit changes with a message
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git locally (02): modifications and history</h2>
					<pre><code data-trim class="python">
					git rm &lt;file name&gt; #Erase a file within Git
					</code></pre>
					<pre><code data-trim class="python">
					git rm -f &lt;file name&gt; #Erase a file from the index from Git 
					</code></pre>
					<pre><code data-trim class="python">
					git mv &lt;file name&gt; &lt;wheretomove&gt; #Move a file within Git
					</code></pre>
					<pre><code data-trim class="python">
					git log #Commit history in the command line
					</code></pre>
					<pre><code data-trim class="python">
					gitk #Commit history in a separate window
					</code></pre>
					<pre><code data-trim class="python">
					git diff-tree --no-commit-id --name-only -r &lt;commithash&gt; #Changed files of a commit
					</code></pre>
					<pre><code data-trim class="python">
					git ls-tree --name-only &lt;commithash&gt; #All files of a commit
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git locally (04): undoing</h2>
					<pre><code data-trim class="python">
					01: git commit -m "initial commit"
					</code></pre>
					<pre><code data-trim class="python">
					02: git add &lt;forgotten file&gt;
					</code></pre>
					<pre><code data-trim class="python">
					git commit --amend #Replace last commit with added/removed files
					</code></pre>
					<pre><code data-trim class="python">
					git reset HEAD &lt;file name&gt; #Unstage a staged file
					</code></pre>
					<pre><code data-trim class="python">
					git checkout -- &lt;file name&gt; #Overwrite a file with last commit version
					</code></pre>
<p class="source">More information: <a href="http://git-scm.com/book/en/Git-Basics-Undoing-Things">http://git-scm.com/book/en/Git-Basics-Undoing-Things</a> </p>
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git remotely (05): Remotes</h2>
					<pre><code data-trim class="python">
					git clone &lt;link to repository&gt; #Clone a remote repo locally
					</code></pre>
					<pre><code data-trim class="python">
					git add remote &lt;name&gt; &lt;link to repo&gt; #Add a remote repository with a name
					</code></pre>
					<pre><code data-trim class="python">
					git remote -v #View current remotes
					</code></pre>
					<pre><code data-trim class="python">
					git remote rm &lt;name of the remote&gt; #Remove a remote repo
					</code></pre>
					<pre><code data-trim class="python">
					git push &lt;name of the remote&gt; #Push local changes to remote
					</code></pre>
					<pre><code data-trim class="python">
					git fetch &lt;name of the remote&gt; #Get new version from remote without merge
					</code></pre>
					<pre><code data-trim class="python">
					git pull &lt;name of the remote&gt; #Get+merge new version from remote
					</code></pre>
				</section>
				
				<section>
					<h2>Git: commit history</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits01.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: commit history</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits02.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Branching</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits03.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Branching</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits04.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Merging</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits05.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Using Git locally (06): branches</h2>
					<pre><code data-trim class="python">
					git branch &lt;name of the branch&gt; #Create a local branch
					</code></pre>
					<pre><code data-trim class="python">
					git push &lt;name of the remote&gt; &lt;name of the branch&gt; #Push branch to remote
					</code></pre>
					<pre><code data-trim class="python">
					git checkout &lt;name of the branch&gt; #Switch to another branch
					</code></pre>
					<pre><code data-trim class="python">
					git checkout master #Go back to master branch
					</code></pre>
					<pre><code data-trim class="python">
					git diff &lt;name of the branch&gt; master #Diff branches before merging
					</code></pre>
					<pre><code data-trim class="python">
					git merge &lt;name of the branch&gt; #Merge the branch with current branch
					</code></pre>
					<pre><code data-trim class="python">
					git branch -d &lt;name of the branch&gt; #Delete a local branch
					</code></pre>
					<pre><code data-trim class="python">
					git push origin :&lt;name of the branch&gt; #Delete a remote branch
					</code></pre>
				</section>	
				
				<section>
					<h2>Using Git: Tags</h2>
					<pre><code data-trim class="python">
					git tag #List existing tags
					</code></pre>
					<pre><code data-trim class="python">
					git tag -a tagname -m 'messagetext' #Create a version tag, tagname = v1.0
					</code></pre>
					<pre><code data-trim class="python">
					git push origin tagname # Push a tag to the remote repository
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git: Diff & Difftool</h2>
					<pre><code data-trim class="python">
					git diff #Diff w/ Index / Working Directory
					</code></pre>
					<pre><code data-trim class="python">
					git diff HEAD #Diff w/ HEAD / Working Directory
					</code></pre>
					<pre><code data-trim class="python">
					git diff &lt;sha1&gt; &lt;sha2&gt; #Diff w/ two commits
					</code></pre>
					<pre><code data-trim class="python">
					git difftool &lt;...&gt; #Better diff and for images
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git: Merge binary files</h2>
					<pre><code data-trim class="python">
  					CONFLICT (content): Merge conflict in index.html
  					</code></pre>
  					<pre><code data-trim class="python">
  					Automatic merge failed; fix conflicts and then commit the result.
					</code></pre>
					<pre><code data-trim class="python">
					git checkout --theirs &lt;filename&gt; #Keep their/remote file
					</code></pre>
					<pre><code data-trim class="python">
					git checkout --ours &lt;filename&gt; #Keep my/local file
					</code></pre>
					<pre><code data-trim class="python">
					git add &lt;filename&gt; #After checkout, don't forget to add
					</code></pre>
					<p class="source">Source: <a href="http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html">http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html</a></p>
				</section>
				
				<section>
					<h3>Lunch time! Questions?</h3>
					<h3>See you at 13:00</h3>
				</section>
				
				<section>
					<h2>GitHub: Quota</h2>
					<a href="https://help.github.com/articles/what-is-my-disk-quota">
					<img src="images/github-quota.jpg">
					</a>
					<p class="source">Source: <a href="https://help.github.com/articles/what-is-my-disk-quota">https://help.github.com/articles/what-is-my-disk-quota</a></p>
				</section>

				<section>
					<h2>Git: Centralized Workflow</h2>
					<a href="http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows">
					<img src="images/centralized-workflow.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Integration Manager Workflow</h2>
					<a href="http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows">
					<img src="images/integration-manager-workflow.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section><commit_msg>Add more slides to four lesson<commit_after><!doctype html>
<html lang="en">

	<head>
		<meta charset="utf-8">
		<title>Design with the user: Version Control Systems</title>
		<meta name="apple-mobile-web-app-capable" content="yes" />
		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

		<link rel="stylesheet" href="css/reveal.min.css">
		<link rel="stylesheet" href="css/theme/supsi.css" id="theme">
		<link href='http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
		<link href='http://fonts.googleapis.com/css?family=Fjalla+One' rel='stylesheet' type='text/css'>
		
		<link rel="icon" href="http://www.maind.supsi.ch/Master_Interaction_Design-favicon.jpg" type="image/x-icon" />
                <link rel="shortcut icon" href="http://www.maind.supsi.ch/Master_Interaction_Design-favicon.jpg" type="image/x-icon" />
		
		<!-- For syntax highlighting -->
		<link rel="stylesheet" href="lib/css/zenburn.css">

		<!-- If the query includes 'print-pdf', use the PDF print sheet -->
		<script>
			document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
		</script>

		<!--[if lt IE 9]>
		<script src="lib/js/html5shiv.js"></script>
		<![endif]-->
	</head>

	<body>

		<div class="reveal">

			<!-- Any section element inside of this container is displayed as a slide -->
			<div class="slides">

				<section>
					<h1>Design with the user</h1>
					<h3>05 December 2013</h3>
				</section>
				
				<section>
					<h3>1. Git</h3>
					<h3>2. GitHub</h3>
				</section>
				
				<section>
					<h1>1. Git</h1>
				</section>
				
				
				
<section>
					<h2>Git: workflow of a file</h2>
					<a href="http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository">
					<img src="images/git-file-workflow.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: workflow</h2>
					<a href="http://commons.wikimedia.org/wiki/Category:Git">
					<img src="images/gitflow.jpg">
					</a>
					<p class="source">Source: <a href="http://commons.wikimedia.org/wiki/Category:Git">http://commons.wikimedia.org/wiki/Category:Git</a></p>
				</section>

				<section>
					<h2>Using Git locally (01): start</h2>
					<pre><code data-trim class="python">
					cd &lt;directory name&gt; #Enter into the project directory
					</code></pre>
					<pre><code data-trim class="python">
					git init #Start local repository
					</code></pre>
					<pre><code data-trim class="python">
					git status #Get status of the working directory/stage
					</code></pre>
					<pre><code data-trim class="python">
					git add &lt;file name&gt; #Add a file to the stage
					</code></pre>
					<pre><code data-trim class="python">
					git add . #Add all files from current directory to the stage
					</code></pre>
					<pre><code data-trim class="python">
					git add -a :/ #Add all files recursively
					</code></pre>
					<pre><code data-trim class="python">
					git add -u #Update (add) all files already being tracked
					</code></pre>
					<pre><code data-trim class="python">
					git commit -m "messagetext" #Commit changes with a message
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git locally (02): modifications and history</h2>
					<pre><code data-trim class="python">
					git rm &lt;file name&gt; #Erase a file within Git
					</code></pre>
					<pre><code data-trim class="python">
					git rm -f &lt;file name&gt; #Erase a file from the index from Git 
					</code></pre>
					<pre><code data-trim class="python">
					git mv &lt;file name&gt; &lt;wheretomove&gt; #Move a file within Git
					</code></pre>
					<pre><code data-trim class="python">
					git log #Commit history in the command line
					</code></pre>
					<pre><code data-trim class="python">
					gitk #Commit history in a separate window
					</code></pre>
					<pre><code data-trim class="python">
					git diff-tree --no-commit-id --name-only -r &lt;commithash&gt; #Changed files of a commit
					</code></pre>
					<pre><code data-trim class="python">
					git ls-tree --name-only &lt;commithash&gt; #All files of a commit
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git locally (04): undoing</h2>
					<pre><code data-trim class="python">
					01: git commit -m "initial commit"
					</code></pre>
					<pre><code data-trim class="python">
					02: git add &lt;forgotten file&gt;
					</code></pre>
					<pre><code data-trim class="python">
					git commit --amend #Replace last commit with added/removed files
					</code></pre>
					<pre><code data-trim class="python">
					git reset HEAD &lt;file name&gt; #Unstage a staged file
					</code></pre>
					<pre><code data-trim class="python">
					git checkout -- &lt;file name&gt; #Overwrite a file with last commit version
					</code></pre>
<p class="source">More information: <a href="http://git-scm.com/book/en/Git-Basics-Undoing-Things">http://git-scm.com/book/en/Git-Basics-Undoing-Things</a> </p>
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git remotely (05): Remotes</h2>
					<pre><code data-trim class="python">
					git clone &lt;link to repository&gt; #Clone a remote repo locally
					</code></pre>
					<pre><code data-trim class="python">
					git add remote &lt;name&gt; &lt;link to repo&gt; #Add a remote repository with a name
					</code></pre>
					<pre><code data-trim class="python">
					git remote -v #View current remotes
					</code></pre>
					<pre><code data-trim class="python">
					git remote rm &lt;name of the remote&gt; #Remove a remote repo
					</code></pre>
					<pre><code data-trim class="python">
					git push &lt;name of the remote&gt; #Push local changes to remote
					</code></pre>
					<pre><code data-trim class="python">
					git fetch &lt;name of the remote&gt; #Get new version from remote without merge
					</code></pre>
					<pre><code data-trim class="python">
					git pull &lt;name of the remote&gt; #Get+merge new version from remote
					</code></pre>
				</section>
				
				<section>
					<h2>Git: commit history</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits01.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: commit history</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits02.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Branching</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits03.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Branching</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits04.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Merging</h2>
					<a href="http://git-scm.com/book/en/Git-Branching-What-a-Branch-Is">
					<img src="images/git-commits05.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Using Git locally (06): branches</h2>
					<pre><code data-trim class="python">
					git branch &lt;name of the branch&gt; #Create a local branch
					</code></pre>
					<pre><code data-trim class="python">
					git push &lt;name of the remote&gt; &lt;name of the branch&gt; #Push branch to remote
					</code></pre>
					<pre><code data-trim class="python">
					git checkout &lt;name of the branch&gt; #Switch to another branch
					</code></pre>
					<pre><code data-trim class="python">
					git checkout master #Go back to master branch
					</code></pre>
					<pre><code data-trim class="python">
					git diff &lt;name of the branch&gt; master #Diff branches before merging
					</code></pre>
					<pre><code data-trim class="python">
					git merge &lt;name of the branch&gt; #Merge the branch with current branch
					</code></pre>
					<pre><code data-trim class="python">
					git branch -d &lt;name of the branch&gt; #Delete a local branch
					</code></pre>
					<pre><code data-trim class="python">
					git push origin :&lt;name of the branch&gt; #Delete a remote branch
					</code></pre>
				</section>	
				
				<section>
					<h2>Using Git: Tags</h2>
					<pre><code data-trim class="python">
					git tag #List existing tags
					</code></pre>
					<pre><code data-trim class="python">
					git tag -a tagname -m 'messagetext' #Create a version tag, tagname = v1.0
					</code></pre>
					<pre><code data-trim class="python">
					git push origin tagname # Push a tag to the remote repository
					</code></pre>
				</section>
				
				<section>
					<h2>Using Git: Diff & Difftool</h2>
					<pre><code data-trim class="python">
					git diff #Diff w/ Index / Working Directory
					</code></pre>
					<pre><code data-trim class="python">
					git diff HEAD #Diff w/ HEAD / Working Directory
					</code></pre>
					<pre><code data-trim class="python">
					git diff &lt;sha1&gt; &lt;sha2&gt; #Diff w/ two commits
					</code></pre>
					<pre><code data-trim class="python">
					git difftool &lt;...&gt; #Better diff and for images
					</code></pre>
				</section>
				
				<section>
					<h2>Git: Checkout/Reset</h2>
					<pre><code data-trim class="python">
					git checkout &lt;name of the branch&gt; #Switch to another branch
					</code></pre>
					<pre><code data-trim class="python">
					git checkout master #Go back to master branch
					</code></pre>
					<pre><code data-trim class="python">
					git reset --hard &lt;sha&gt; #Replace working dir with a specific commit
					</code></pre>
					<pre><code data-trim class="python">
					git checkout &lt;sha&gt; #Go back in time at a specific commit
					</code></pre>
					<pre><code data-trim class="python">
					git checkout &lt;sha&gt; &lt;filename&gt; #Get a file from a specific commit
					</code></pre>
					<pre><code data-trim class="python">
					git branch &lt;name of the branch&gt; #But then create e new branch!
					</code></pre>
				</section>	
				
				<section>
					<h2>Using Git: Merge binary files</h2>
					<pre><code data-trim class="python">
  					CONFLICT (content): Merge conflict in index.html
  					</code></pre>
  					<pre><code data-trim class="python">
  					Automatic merge failed; fix conflicts and then commit the result.
					</code></pre>
					<pre><code data-trim class="python">
					git checkout --theirs &lt;filename&gt; #Keep their/remote file
					</code></pre>
					<pre><code data-trim class="python">
					git checkout --ours &lt;filename&gt; #Keep my/local file
					</code></pre>
					<pre><code data-trim class="python">
					git add &lt;filename&gt; #After checkout, don't forget to add
					</code></pre>
					<p class="source">Source: <a href="http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html">http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html</a></p>
				</section>
				
				
				
				<section>
					<h3>Lunch time! Questions?</h3>
					<h3>See you at 13:00</h3>
				</section>
				
				<section>
					<h2>GitHub: Quota</h2>
					<a href="https://help.github.com/articles/what-is-my-disk-quota">
					<img src="images/github-quota.jpg">
					</a>
					<p class="source">Source: <a href="https://help.github.com/articles/what-is-my-disk-quota">https://help.github.com/articles/what-is-my-disk-quota</a></p>
				</section>

				<section>
					<h2>Git: Centralized Workflow</h2>
					<a href="http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows">
					<img src="images/centralized-workflow.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
				
				<section>
					<h2>Git: Integration Manager Workflow</h2>
					<a href="http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows">
					<img src="images/integration-manager-workflow.jpg">
					</a>
					<p class="source">Source: <NAME>. (2009). Pro Git. Berkeley, CA; New York: Apress ; Distributed to the Book trade worldwide by Springer-Verlag. Retrieved from <a href="http://git-scm.com/book">http://git-scm.com/book</a></p>
				</section>
{'fraction_non_alphanumeric': 0.17389519259480443, 'fraction_numerical': 0.011869214690952524, 'mean_word_length': 2.957022596366859, 'pattern_counts': {'":': 0, '<': 831, '<?xml version=': 0, '>': 831, 'https://': 6, 'lorem ipsum': 0, 'www.': 4, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6764272', 'n_tokens_mistral': 11619, 'n_tokens_neox': 9021, 'n_words': 2319}