git-exercise-04/index.html at master · rockborne-git-training/git-exercise-04 · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Home Page</title>
    <link rel="stylesheet" href="css/app.css">
</head>
<body class="home-page">
    <div class="navigation-bar">
        <img src="images/nhs-reverse-logo.png">
        <a class="active" href="contact.html">Contact</a>
        <a class="active" href="team.html">Meet The Team</a>
        <a class="active" href="about.html">About</a>
        <a class="active" href="index.html">Home</a>
    </div>

    <header class="page-header"></header>

    <div class="overlay-box">
        <h2>Exercise 3</h2>
        <p>This exercise requires you all to work collaboratively to make your own individual changes, create pull requests and merge all of your changes.</p>
    </div>

    <div class="task-box">
        <div class="home-page-text">
            <p>Task 1:</p>
            <p>You will each create a new branch and write a short decription of yourself in the 'Meet The Team Section'.</p>
            <p>Once completed, you will commit and push your change to the branch you created.</p>
            <p>Once you've pushed your changes, go to the GitHub repository and open a Pull Request.</p>
            <p>The person responsible for managing the repository will review the pull request and approve it if everything looks good.</p>
            <p>After approval, they will merge the pull request into the main branch.</p>
        </div>
    </div>

    <div class="home-page-task-two">
        <p>Task 2:</p>
        <p>Insert some text in the 'contact' page on the same line as someone else and try to merge it to see what happens.</p>
        <p>This is where we'll be learning to deal with merge conflicts.</p>
    </div>

    <script src="javascript/app.js"></script>
</body>
</html>