Skip to content

barbzyqueen/html-css-course

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

12 Commits
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

This Read Me Contains details of the steps I took to complete the Assignment

  1. Cloning a Repository:

  2. Forking a Repository:

  3. Creating and Switching Branches:

    • In the git bash terminal, I created a new branch and switched to it by using the command: git checkout -b feature-update
  4. Making Changes and Committing:

    • In the feature-update branch, I created an index.html file
    • Then I added the changes to the staging area using the command: git add .
    • I commited the changes using the command: git add -m "Added Changes to index.html file in feature-update branch"
  5. Merging Changes:

    • I switched back to the master branch using the command: git checkout -
    • I merged the changes from the feature-update branch into the master branch using the command: git merge feature-update
    • The index.html file was added to the master branch
  6. Creating Conflicts: In my forked repository on my local machine I also created an index.html file

    • I created an index.html file
    • Then I added the changes to the staging area using the command: git add .
    • I commited the changes using the command git add -m "Added index.html file in master branch"
    • In the git bash terminal, I created a new branch and switched to it by using the command: git checkout -b feature-update
    • In my the feature-update branch I modified a line of code. I changed the contents of the h2 tag in line 9
    • I added the changes and committed them
    • Then I switched back to the master branch using the command: git checkout -
  7. Resolving Conflicts:

    • I modified the code on line 9 again in the index.html file of the master branch
    • I added and committed the changes
    • Then I merged the feature-update branch into the master branch using the command: git merge feature-update
    • This created a conflict and gave me the following error: Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.
    • In the index.html file, I had to aceept either the current change or incoming change to resolve the conflict Resolving Merge Conflict
    • I chose the incoming change and the conflict was resolved.
  8. Enabling GitHub Pages:

    • I already had my index.html file created in my forked repository
    • To deploying my index.html file live using github pages
    • I navigated to the forked repository on my github account
    • I opened Settings Tab tab near the top of the repository page.
    • I clicked on Pages, in the left sidebar under "Code and automation"
    • Afterwards, I configured my GitHub Pages
    • Under the "Build and deployment" section, I clicked the "Source" dropdown and selected Deploy from Branch
    • I saved my settings and waited for Deployment.
  9. Accessing the Published Page:

  10. Exploring Open Source Projects:

About

Starter files, final projects, and FAQ for my HTML + CSS course

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • HTML 65.6%
  • CSS 32.7%
  • JavaScript 1.7%