modules

Git: Merge Conflicts

❇️ Example

  1. cd into the <yourname>-simple-website/ folder and open the directory in sublime as well.

    cd ~/Development/<yourname>-simple-website
subl .

  2. Run git status to make sure the repository is “clean” (i.e. there are no “untracked files”, “unstaged changes”, or “staged changes”).

  3. Run git pull to ensure you have the latest changes in the repository.

  4. Create a branch called teal-website.

    1. Add the following to the top of styles/styles.css

       body {
     background: teal;
 }
    2. Use git diff to ensure that you only modified that one thing and nothing else.
    3. Commit this change to the branch.
    4. Push the branch.
    5. Create a pull request but do not merge it.

  5. Check out the master branch

  6. Create a new branch called orange-website.

    1. Add the following to the top of styles/styles.css

       body {
     background: orange;
 }
    2. Use git diff to ensure that you only modified that one thing and nothing else.
    3. Commit this change to the branch.
    4. Push the branch.
    5. Create a pull request but do not merge it.

  7. Merge the orange-website pull request. Try to merge the teal-website pull request and it should say the branch cannot be automatically merged. This mean’s there is a merge conflict.

  8. Create a branch called black-website.

    1. Add the following to the top of styles/styles.css

       body {
     background: black;
 }
    2. Use git diff to ensure that you only modified that one thing and nothing else.
    3. Commit this change to the branch.
    4. Push the branch.
    5. Do not merge this branch, we’re going to throw away these changes

➡️ Try It

  1. cd into your universe repository

  2. Make sure the repository is clean and you are in the master branch.

  3. Create a branch called alternative-facts.

  4. Go back to the master branch.
    1. git checkout master
    2. Add two facts to mars.txt: “Mars has polar ice caps.” and “Mars is a little more than half the size of earth.”
    3. Commit these changes to master.
  5. Go back to the alternative-facts branch.
    1. git checkout alternative-facts
    2. Add two facts to mars.txt. “Mars is gaseous.” and “Mars is double the size of earth.”
    3. Commit these changes to alternative-facts.
    4. Create a pull request using alternative-facts.
  6. Attempt to merge the pull request and try to resolve the merge conflicts.

➡️ Try It

  1. Get into your teams.

  2. The product owner should:
    1. create a repository under their account named demo-website
    2. add the remaining team members as collaborators to the repo. this is done under the repo settings
    3. enable github pages on this repo with the master branch as the source

  3. Everyone should clone the empty repository.

     git clone git@github.com:XXXXX/demo-website.git

  4. The product owner should create an index.html and a page called our-team/index.html. Commit and push this change directly to the master branch.

    Here is a sample index.html:

     <!DOCTYPE html>
 <html>
     <head>
         <title>Demo Website</title>
     </head>
     <body>
         <h1>Our Demonstration Website</h1>
         <a href='our-team/index.html'>Learn more about our team</a>
     </body>
 </html>

    Here is a sample our-team/index.html:

     <!DOCTYPE html>
 <html>
     <head>
         <title>Demo Website</title>
     </head>
     <body>
         <h1>About Us!</h1>
     </body>
 </html>

  5. Everyone else should pull these changes.

     git pull

  6. All team members, should create branches titled add-member-<name>.

    For example a team might have add-member-rachel, add-member-monica, add-member-phoebe, etc.

  7. In this branch, each team member should create a file that is titled our-team/<name>.html. For example, I would create our-team/dhrumil.html. Add some basic information about yourself to this page. Be sure to only create this one file - there should be no other changes to the repository. It’s important to keep your code changes isolated when working with git to avoid unecessary merge conflicts.
    1. Each member should:
      1. commit this change to the branch
      2. push it
      3. create a pull request
    2. Product owner should review and merge all of the PRs. There should be no conflicts.

  8. The product owner should create links to each of these individal pages back into the our-team/index.html.

     <!DOCTYPE html>
 <html>
 <head>
     <title>Demo Website</title>
 </head>
 <body>
     <h1>About Us!</h1>
     <ul>
         <li><a href="our-team/rachel.html">Rachel</a></li>
         <li><a href="our-team/monica.html">Monica</a></li>
         <li><a href="our-team/phoebe.html">Phoebe</a></li>
         <li><a href="our-team/joey.html">Joey</a></li>
         <li><a href="our-team/chandler.html">Chandler</a></li>
         <li><a href="our-team/ross.html">Ross</a></li>
     </ul>
 </body>
 </html>

  9. All team members should checkout the master branch and pull the latest code.

     git checkout master
 git pull

Your repository and website should look something like this: