From 331703459dc68b0d520a35174629441d0e185879 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Nov 2025 16:02:14 +0300 Subject: [PATCH] Added git-challenges and presentation --- .DS_Store | Bin 0 -> 6148 bytes LICENSE | 18 - Presentatinon_Git_Fundamentals.html | 579 ++++++++++++++++++++++++++++ README.md | 27 -- git-challenges | 1 + light.html | 18 - pic_bulboff.gif | Bin 2493 -> 0 bytes pic_bulbon.gif | Bin 2554 -> 0 bytes 8 files changed, 580 insertions(+), 63 deletions(-) create mode 100644 .DS_Store delete mode 100644 LICENSE create mode 100644 Presentatinon_Git_Fundamentals.html delete mode 100644 README.md create mode 160000 git-challenges delete mode 100644 light.html delete mode 100644 pic_bulboff.gif delete mode 100644 pic_bulbon.gif diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2c66a278b79fd659ec49e9e9618694db8f16db53 GIT binary patch literal 6148 zcmeHKO-~a+7=8yT?SjBkN=2f{CQUq{6bwY;!Mb1!YEnXLE%H%!+o5dO?likw3L;6* zdh`eQ8@ze(;>katSMQ$u0Ums3XBs{#9*xm?o0;dG_iH-Oe#{O45VKXA1<(N?fsJEq z5W8Op_w&{xebT~_L^Z0g0~WaWqdn2epcqgL{A~>IXLkhZ;6Mo1;pFq{p_M{lw}Ynb zG8^OG+fCOA!ff^n>FbYO7>LKU_)vVau*2Gg&dZeecPSh#sKZ5+;KZ)c~C`T2#T zBP}tJnYpuC*>xKpdnHIE_zsF>SYj7mqw?D|I@LY7M)I+{#;^LATxCKV9J)9>GOCXy z$5Y9PWICNrU7Ac^o|?K+(Z_A8x?A`8|6gP-^G&x!*XzDhD>SXDevvKd*D;*MfLLA+W`&B6@4_Q`pk7#Sm1;X^VUvy*PdDXMLFL_ zfEQvpq>W{7o8jbpcoFhVo)MI&A0YOWDz90-Z+UfU9&EanP2Id_vM^)~9?7d!nYZFo zUa9P$&X<+B`(4nS$vx^SH-w@?Mku&_=%nab4XSCGTuB-ec)u+|9?H;wm+%JO!aMi? zpWrimgCAsoq{uZgLvE3KEfgS&R;Qkm#E~xXf1V=++PGUzOdQgZ+MHHz-9x;eW zN4p{8auPcNMLLjZW~?J;Ch~+rqS?`IMBzYk0#&aVPz;=ApkEAizW?7p|NMVCNsSZ( zih+NM0TNp(ESb0@xwrN#j_ + + + + + Git Fundamentals - Grade 11 ICT + + + +
+
+ +
+ + +
+
+ +
+
+ +
+

Lesson 1: Introduction to Git

+

Learning Outcomes

+
    +
  • Understand what Git is and why it's important for developers
    • +
  • Install Git on your computer
    • +
  • Configure Git with your user credentials
    • +
  • Understand the basic Git workflow
    • +
+ +

Why Git Matters

+
+

Git is the most widely used version control system in the world. It allows developers to:

+
    +
  • Track changes to code over time
    • +
  • Collaborate with other developers on the same project
    • +
  • Revert to previous versions if something goes wrong
    • +
  • Work on different features simultaneously without conflicts
    • +
+

Understanding Git is essential for any software development career!

+
+
+ +
+

Git Introduction Video

+
+ +
+

+ Note: We're using a general Git introduction video here. The original link was to a text tutorial, but a video is more engaging for a presentation. +

+
+ +
+

Setting Up Git

+

Installation Instructions

+ +

Windows/Mac

+
    +
  • Visit git-scm.com
    • +
  • Download the latest version for your operating system
    • +
  • Run the installer with default settings
    • +
+ +

Chrome OS (2020+ devices)

+
    +
  • Go to the Launcher
    • +
  • Search for "Linux" and click "Turn on"
    • +
  • Git is included in the Linux environment
    • +
+ +

Older Chrome OS devices

+
    +
  • Install Termux from the Google Play Store
    • +
  • Open Termux and enter: pkg install git
    • +
  • Type y when prompted to confirm installation
    • +
+
+ +
+

Configuring Git

+

Setting Your Credentials

+ +

After installing Git, you need to configure your username and email address:

+ +
+git config --global user.name "g11s1"
+git config --global user.email "g11s1@ict.ru" +
+ +
+

Important Note: Git credentials are set per computer, not per folder. If you change computers or someone else uses your computer, you'll need to check and possibly update the Git user credentials.

+

To check your current Git configuration:

+
git config --list
+
+ +

Exercise: Configure Git

+
+
    +
  1. Open your terminal/command prompt
    2. +
  2. Set your username: git config --global user.name "g11sX" (replace X with your student number)
    3. +
  3. Set your email: git config --global user.email "g11sX@ict.ru"
    4. +
  4. Verify your settings: git config --list
    5. +
+
+
+ + +
+

Lesson 2: Working with Local Repositories

+

Learning Outcomes

+
    +
  • Create and initialize a local Git repository
    • +
  • Understand the basic Git workflow: add, commit, status
    • +
  • Fork and clone remote repositories
    • +
  • Make changes and push them to a remote repository
    • +
+ +

Why This Matters

+
+

Local repositories allow you to work on projects independently before sharing your changes. Understanding how to:

+
    +
  • Create repositories
    • +
  • Track changes with commits
    • +
  • Work with remote repositories
    • +
+

These are fundamental skills for any development workflow!

+
+
+ +
+

Challenge 1: Local Repository

+
+
    +
  1. Create a new folder called my-first-git-project
    2. +
  2. Initialize it as a Git project: git init
    3. +
  3. Open the folder in Sublime Text
    4. +
  4. Create a basic README.md with an explanation of a project you'd like to do (use headers, lists, etc.)
    5. +
  5. Add the file to staging: git add README.md
    6. +
  6. Commit the changes: git commit -m "Added README file"
    7. +
  7. Check the commit history: git log
    8. +
+
+ +

Example README.md

+
+# My First Git Project
+
+## Project Description
+This is a simple web application that will:
+- Display current weather information
+- Allow users to search for weather by city
+- Show a 5-day forecast
+
+## Technologies Used
+- HTML
+- CSS
+- JavaScript
+- Weather API +
+
+ +
+

Challenge 2: Fork and Clone Repository

+
+

Forking a Repository

+
    +
  1. Go to the example repository: https://gitea.techshare.cc/technolyceum/g11-m2.git
    2. +
  2. Click the "Fork" button to create your own copy
    3. +
+ +

Cloning to Your Local Environment

+
    +
  1. Open your terminal/command tool
    2. +
  2. Navigate to your projects folder: cd projects
    3. +
  3. Clone your forked repository: git clone [your-forked-repo-url]
    4. +
  4. Navigate into the new folder: cd [repository-name]
    5. +
+ +

Making and Pushing Changes

+
    +
  1. Make changes to the index.html file
    2. +
  2. Stage your changes: git add .
    3. +
  3. Check status: git status
    4. +
  4. Commit changes: git commit -m "Changed index file"
    5. +
  5. Push to remote: git push -u origin master
    6. +
  6. Review your changes on the remote repository website
    7. +
+
+
+ + +
+

Lesson 3: Collaboration with Git

+

Learning Outcomes

+
    +
  • Add collaborators to a GitHub repository
    • +
  • Clone and work on a collaborator's repository
    • +
  • Understand how to push changes and view differences
    • +
  • Use Git commands to compare changes between versions
    • +
+ +

Why Collaboration Matters

+
+

Most software development happens in teams. Git enables:

+
    +
  • Multiple developers to work on the same codebase
    • +
  • Clear tracking of who made what changes
    • +
  • Managing contributions from different team members
    • +
  • Resolving conflicts when changes overlap
    • +
+

These collaboration skills are essential for real-world development!

+
+
+ +
+

Adding Collaborators

+
+

Step 1: Pair Up

+

Find a partner for this exercise - either a classmate or mentor.

+ +

Step 2: Add Collaborator in GitHub

+
    +
  1. Navigate to your project in GitHub
    2. +
  2. Click on the 'Settings' tab
    3. +
  3. Select 'Collaborators' from the left menu
    4. +
  4. Click 'Add people' and search for your partner's GitHub username
    5. +
  5. Send the collaboration invitation
    6. +
+ +
+

Note: The exact steps may vary slightly depending on the Git platform (GitHub, GitLab, Gitea, etc.), but the concept is the same.

+
+
+
+ +
+

Collaboration Exercise

+
+

Step 3: Clone and Modify

+
    +
  1. Your partner should clone your repository: git clone [your-repo-url]
    2. +
  2. Create a new folder for this project if needed
    3. +
  3. Give your partner a simple "spec" - a small change to make in your project
    4. +
  4. Your partner makes the change, then: +
    +git add .
    +git commit -m "Made requested change"
    +git push origin master +
    +
    5. +
+ +

Step 4: Review Changes

+
    +
  1. Pull the latest changes: git pull origin master
    2. +
  2. View recent changes: git diff HEAD
    3. +
  3. Compare with previous version: git diff HEAD~1
    4. +
  4. Check the commit history on GitHub to see your partner's contribution
    5. +
+ +

Step 5: Reverse Roles

+

Now repeat the process with roles reversed - you become the collaborator on your partner's repository.

+
+
+ +
+

Git Commands Summary

+

Basic Git Workflow

+ +
+# Initialize a new repository
+git init

+ +# Clone an existing repository
+git clone [repository-url]

+ +# Check status of files
+git status

+ +# Add files to staging
+git add [filename]
+git add . # Add all files

+ +# Commit changes
+git commit -m "Commit message"

+ +# Push to remote repository
+git push origin master

+ +# Pull latest changes
+git pull origin master

+ +# View commit history
+git log

+ +# Compare changes
+git diff
+git diff HEAD
+git diff HEAD~1 +
+ +

Congratulations!

+

You've completed the 3-lesson Git fundamentals course. You now have the basic skills to use Git for version control and collaboration!

+
+
+
+ +
+ +
+ +
+ Grade 11 ICT - Git Fundamentals | Use the navigation buttons to move between slides +
+
+ + + + \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index e78e9b3..0000000 --- a/README.md +++ /dev/null @@ -1,27 +0,0 @@ -I am updateing this text. - -## 🎯 Here's What You Need to Do: - -### Step 1: Make Your Own Copy -- Click the **FORK** button at the top ↑ -- This creates your personal workspace - -### Step 2: Go to Your Workspace -- After forking, you'll see YOUR name in the website address -- This is now YOUR project - -### Step 3: Work on Your Project -- Only work in YOUR forked copy -- Your teacher will check YOUR work here - -## ❌ Important: Don't Work Here! -- This page is just the starting template -- Your work should be in YOUR copy - -## ✅ Remember: -- Always click FORK first -- Always work in your forked copy -- Your username should be in the website address - -## Need Help? 🤔 -Just ask your teacher! We're here to help you learn. diff --git a/git-challenges b/git-challenges new file mode 160000 index 0000000..25509f3 --- /dev/null +++ b/git-challenges @@ -0,0 +1 @@ +Subproject commit 25509f3f2249a4bb8aab3bddf4808475ef28ba7e diff --git a/light.html b/light.html deleted file mode 100644 index 8a6af9b..0000000 --- a/light.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - -

What Can JavaScript Do?

- -

JavaScript can change HTML attribute values.

- -

In this case JavaScript changes the value of the src (source) attribute of an image.

- - - - - - - - - \ No newline at end of file diff --git a/pic_bulboff.gif b/pic_bulboff.gif deleted file mode 100644 index 65cacddab02fae95a13f5676c9b5ea878ebc3612..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2493 zcmcIfi8~XH8{gb_?wnbSw9pt5s*zzMH#t{xOtH#+Mc+9hN-~Tgx0U;jP|Y#t2+f@% z%#rBpD&MbaKfeFN@AJN&<9Xlbd7tMsK^p5^#&`l60pm;ng+gI6X~)H+9V>}R!!l_w zCW*u(VVNY@$@qBjA88~kjRYf|087FiHw=56P9pX=Vqvfo`Ol6c3GPzq9qN8-7ty_{8x0ZkVSjw%EAXzn*10k0fQgCgo&%yznl1 zm>*0ieC_UQc)u(!3F-c%y0PHV%a*E|%H+291=c0t-qVo<>&69Uyqfn=0PLq+ z!>V1^3WvMXjc)G-_+KN#^Tnu_ac5BqlMPMRNzdO3r(5r746eeDVlE|33yn3)q042VXdG7bvX&Iv zcJ}(suFQ4dqZy){d3R;<3Qd3HQargL!Nb%1NP$3#jw-1(@#`Nq8J2I+mnT{dyFstcJ070`e6A0DO+SDRIA$LI76aNVokn%XIq* zN7F(tTN~U?y11pO>;X8{0$L_)qcZ1p^On;Y#6+s)sHgplE7t$8xxxOW-n4W5BPQ+~ z2Bg~F#x8xrb0*vnjAnJ&2!>neAfX1FAh?zH-Piu3^WX%cbwTVqze7-H^03g-Rdy-S zkKW=O-O}X3x=D=no3qO~!4ejsXjxv}hB?(8du_L*f0AFxy~^^+9K3fX=5R6MgFL5i zqQp$c9q8)_Y+hswac#!CKl21hJ;1DheWw6cvlqq|e zAaI9Ek+Kea(6Tz=EED=k2lX9S{M+VbQN8MBWoa*WuNN30M)l)GesEBRPZ3`41Twi#wAyJNSv>>V_eR!{eYBgO|qTmpu^%xy19c04X zS7}gBZhh!8wf6;eyL59bzRyUSSh-Ue@k%uW+1?Q-KZn{Rhg<E(C3#%XMI9QVt59hQ+{2*{*ry-Q%BNhY1EO^H zxKh+#sHgLB2asfY%;f+_J&KX0wWb)QCk$N)))cPpJL|o;hpl%woH{pT$R7O$k1~pebdk zvt`*+RHv#=Yg^Cd3OxDQ9d;oeOY;&519mFHM&J@C#z>l^oNqhiFI!)fA;XSDA&LG@ znL#T(be(=1pWXCox`Uj(lZk@H*paH1`*!lXtB!q-A1XEdF$(s>tp4Wgl4B`Om+#y(^nBl03BOhIqY zvDtTKPj;YgS>^3{QTL6VGUhblQv-$9WIh5=29%FT3&a7!?u*!fhkicJFKZ2N0HrTUm0B=uNk+3 zNegYB z!kXxMl#=yqd<65S({jHWc`A^+8fNhOXF_q{(fS|F;DGV_AxRK7m!AAkLUKZk?6Rc1 z-IV2)@U=BQ=P1aSqkt^YE;ULTGY2tmC&rT{=29lUL7KjEnUW?~Di&C{=|gcpNNEQy zroh?rPf)>4SNF~dS{tdvK!{$ZPrY0#jP1%w`Ohx9n~0liaJJt)aCKl;IDhGD!=jXC zYc+%P{14WxKuyh9cw-p18f}%cuG@6rxo$EGm$O^w93Vke1y&obFMEG+xtMqUKaigVymus*&?bpF}xK0Opr;`BA zwDVK7+DSZ`a9>?Tl$v#TB%$|(4Rx9ol{H2Kes0UW2TS5<3hg$BorVU#*+HY>{WbuX zb6ADT45g^>L1&39{mFh$23UWnF@}jyzspB}*-rJ!Y+n#FzKqJl0;xE59 zmOAu?L{w}ksQ}>BEykd1yP3@yX!K)PG|R;myt_uNAwPbRRZagHl@}wCe33(4ss+=> ltF?Qs(eH7hdU&4;nuE&@&LUY0;0$^sA@ErOVE_Q={SQ@6g0KJp diff --git a/pic_bulbon.gif b/pic_bulbon.gif deleted file mode 100644 index 72ecfc4ae0318e237e31d39e7c5a6516d99bb971..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2554 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