77 lines
2.5 KiB
HTML
77 lines
2.5 KiB
HTML
<!DOCTYPE html>
|
||
<!-- saved from url=(0089)https://lyceum.bates.edu/pluginfile.php/582748/mod_resource/content/1/mypage.html?embed=1 -->
|
||
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||
<title>DCS 211 – Git & GitHub Collaboration Lab</title>
|
||
</head>
|
||
|
||
<body data-new-gr-c-s-check-loaded="14.1272.0" data-gr-ext-installed="">
|
||
|
||
<h1>DCS 211: Git and GitHub Collaboration</h1>
|
||
<h1>Instructor: Chris Agbonkhese </h1>
|
||
<h2>Today's Focus</h2>
|
||
<ul>
|
||
<li>Understanding Git collaboration workflow</li>
|
||
<li>Working with shared repositories on GitHub</li>
|
||
<li>Experiencing merge conflicts</li>
|
||
<li>Learning how to resolve conflicts professionally</li>
|
||
</ul>
|
||
|
||
<h2>Lab Activity</h2>
|
||
<p>
|
||
You will work in groups of <strong>two students</strong>.
|
||
Each group will collaborate on a shared GitHub repository.
|
||
</p>
|
||
|
||
<h3>Tasks</h3>
|
||
<ol>
|
||
<li>Clone the repository provided by the instructor.</li>
|
||
<li>Each member edits the same Python file.</li>
|
||
<li>Commit and push your changes.</li>
|
||
<li>Observe any merge conflicts that occur.</li>
|
||
<li>Resolve the conflict as a team.</li>
|
||
</ol>
|
||
|
||
<h3>Time Allocation</h3>
|
||
<ul>
|
||
<li>Lab duration: <strong>40 minutes</strong></li>
|
||
<li>Report submission deadline:
|
||
<strong>20 minutes after class</strong></li>
|
||
</ul>
|
||
|
||
<h2>Deliverables</h2>
|
||
<ul>
|
||
<li>Screenshot of your GitHub commits</li>
|
||
<li>Explanation of any conflict encountered</li>
|
||
<li>Steps taken to resolve it</li>
|
||
</ul>
|
||
|
||
<hr>
|
||
|
||
<p><em>Goal:</em> By the end of this lab, you should be comfortable
|
||
collaborating using GitHub and handling conflicts — a key real-world skill
|
||
for software development and research collaboration.</p>
|
||
|
||
|
||
|
||
|
||
</body><grammarly-desktop-integration data-grammarly-shadow-root="true"><template shadowrootmode="open"><style>
|
||
div.grammarly-desktop-integration {
|
||
position: absolute;
|
||
width: 1px;
|
||
height: 1px;
|
||
padding: 0;
|
||
margin: -1px;
|
||
overflow: hidden;
|
||
clip: rect(0, 0, 0, 0);
|
||
white-space: nowrap;
|
||
border: 0;
|
||
-moz-user-select: none;
|
||
-webkit-user-select: none;
|
||
-ms-user-select:none;
|
||
user-select:none;
|
||
}
|
||
|
||
div.grammarly-desktop-integration:before {
|
||
content: attr(data-content);
|
||
}
|
||
</style><div aria-label="grammarly-integration" role="group" tabindex="-1" class="grammarly-desktop-integration" data-content="{"mode":"full","isActive":true,"isUserDisabled":false}"></div></template></grammarly-desktop-integration></html> |