<li>Compare the current state of a working copy to the last update from the repository, and to the current state of the repository.</li>
<li>Explain what "version 123 of <code>xyz.txt</code>" actually means.</li>
</ul>
+ <p>
+ <span class="duration">20 minutes</span>.
+ </p>
</div>
<p>
<li>Resolve a conflict.</li>
<li>Identify the auxiliary files created when a conflict occurs.</li>
</ul>
+ <p>
+ <span class="duration">20 minutes</span>.
+ </p>
</div>
<p>
<li>Recover an old version of a file.</li>
<li>Explain what branches are and when they are used.</li>
</ul>
+ <p>
+ <span class="duration">20 minutes</span>.
+ </p>
</div>
<p>
</section>
<section id="s:setup">
- <h2>Setting up a Repository</h2>
+ <h2>Setting Up a Repository</h2>
<div class="understand">
<h3>Learning Objectives</h3>
<ul>
<li>How to create a repository.</li>
</ul>
+ <p>
+ <span class="duration">25 minutes</span>
+ (mostly discussion about where to host repositories).
+ </p>
</div>
<p>
<h2>Provenance</h2>
<div class="understand">
- <h3>Understand:</h3>
+ <h3>Learning Objectives</h3>
<ul>
<li>What data provenance is.</li>
<li>How to embed version numbers and other information in files managed by version control.</li>
<li>How to record version information about a program in its output.</li>
</ul>
+ <p>
+ <span class="duration">20 minutes</span>
+ (without a practical exercise).
+ </p>
</div>
<p>