first-git-conflict/index.html at master · islam95/first-git-conflict · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
<!DOCTYPE>
<html lang="en_US">
	<head>
		<title>First Git Merge</title>
		<meta charset="utf-8">
	</head>
	<body>
		<h1>Building websites as a group</h1>
		<p>Websites are almost never built by just one person. You usually need to work together with a team. That means you'll need to coordinate changes to the same files. As professionals, we use version control to coordinate changes, manage conflicts, and help everyone work together on the same code at the same time.</p>
		<p>This gets complicated quickly. Today, you'll begin to work with "git" to accept your first pull request. In the space below, add a new section with your name and a sentence about yourself. I'll get started.</p>
		<h2>Nate Wright</h2>
		<p>I live in Edinburgh with my wife. We have a dog named Peanut and we like to go hiking with him.</p>

		<h2>Islam Dudaev</h2>
		<p>I live in Glasgow with my wife and two daughters. We arrived in Glasgow about a month ago.</p>
	</body>
</html>