group-repo

experiments in conflict

Todos

I will create the repo.
I will add Mike as a collaborator
I will set protection rules.

I will create a branch called initial, create the html file template with nothing in the body and push that up. Then create the pull request for Mike to merge it in.

    <!DOCTYPE html>
    <html lang="en">
        <head>
            <meta charset="UTF-8">
            <meta name="viewport" content="width=device-width, initial-scale=1.0">
            <meta http-equiv="X-UA-Compatible" content="ie=edge">
                <title>Document</title>
        </head>
        <body>
        </body>
    </html>

After he merges my branch in, Mike will pull that down and create a branch called "paragraphs" add the two paragraphs and push up his branch.

    <div>
        <p>I want to make a mess of this.</p>
        <p>I don't even care if we fix it. I just want to see what happens when it breaks.</p>
    </div>

While he is making his changes, I will make some changes of my own on a branch called "heading", and add and commit them.
```
    <h2>This is an experiment</h2>
```
- Change the first paragraph to say, "I want to screw this up"
Mike will then do a git pull origin master to be safe.
Followed by a git add, git commit, and git push to his branch that he will then create a pull request for.
I will merge his changes in.
I will then go back to my branch and git pull origin master to be safe. This is where we should see a conflict to be resolved.
I will then resolve the conflict, save the file, and add, commit, and push the changes in my branch.
I can then create a pull request
Mike will merge that in
We can then both pull into our local master branches, create new branches, and delete old branches.

braydenc303/group-repo

group-repo

Todos