Skip to content

Latest commit

 

History

History
44 lines (30 loc) · 1.64 KB

README.md

File metadata and controls

44 lines (30 loc) · 1.64 KB

git-demo-fa24

in-class git & github demo for ID-20ST-09 FA24

Instructions

  1. Clone this repository to your local machine.
  2. Open the index.html file and add your name to the list of students.
  3. Open the styles.css file and add a CSS rule to style your entry (e.g., change the color, font, or add a border).
  4. View your changes locally (see "Viewing Your Changes Locally" section below).
  5. Commit your changes with a meaningful commit message.
  6. Push your changes back to GitHub.

Files

  • index.html: The main HTML file containing the list of students.
  • styles.css: The CSS file for styling the HTML content.

Viewing Your Changes Locally

To see your changes before committing:

  1. Find the index.html file on your computer.
  2. Right-click the file and select "Open with" and then choose your web browser.
  3. The page should open in your browser, showing your changes.
  4. If you make more changes, save the file and refresh the browser to see updates.

Git Commands

If you are using Git from the command line, here are some basic commands to get you started:

  • Clone: git clone [repository-url]
  • Stage changes: git add .
  • Commit: git commit -m "Your message here"
  • Push: git push origin main

Remember to pull the latest changes before pushing: git pull

Tips for Avoiding Conflicts

  • Always pull the latest changes before starting to work.
  • Try to edit different parts of the file from your classmates.
  • Talk and coordinate before you commit changes.
  • If you encounter a merge conflict, ask for help. It's not a technical issue but a communication issue. Work with whoever else made the changes to resolve the conflict.