diff --git a/docs/schedule/2024Fall/Week7.mdx b/docs/schedule/2024Fall/Week7.mdx index 6134500f7..0c6d50675 100644 --- a/docs/schedule/2024Fall/Week7.mdx +++ b/docs/schedule/2024Fall/Week7.mdx @@ -13,9 +13,9 @@ No meeting held. ## Thursday ### 🎥 Meeting Recording: -{/*
+
-
*/} +
### 🚩 Agenda 1. Sign in with attendance code -2. Presentation by Club E-Board on project contribution fundamentals with `git` +2. Presentation by [Gurpreet](https://www.linkedin.com/in/gurpreet-singh1111/) & [Nick](https://www.linkedin.com/in/nick-bottari-29b5971ba/) with `git` 3. Questions 4. Break for Pizza 5. Shift to Hands-on section - Continue with tutorial @@ -39,13 +39,76 @@ No meeting held. ### 🪄 Meeting Resources - [Git Tutorial](/docs/category/git-version-control) -{/* Insert Presentation IFrame HERE*/} +**Presentation** + ### 📓 Meeting Notes +**Version Control Overview** +- Definition: Version control is a system that gives teams visibility of code history and maintains a single source of documentation. +- Industry Relevance: In practical work at big companies, version control is extremely critical. It allows multiple developers to work on the same project simultaneously without overwriting each other's work. + +**Benefits of Version Control** +- Simultaneous Editing: Developers can edit every file without interfering with each other. + +- Track Changes: Allows tracking of commits and changes to the codebase. + +- Rollback Changes: Easily roll back changes if something goes wrong. + +- Accountability: Keeps track of who made which changes, which is important for accountability. + +- Feature Testing: Enables testing of features without changing the main codebase, making it easier to experiment with new features. + +**Git Concepts** +- Branches: Separate versions of a repository that enable you to work on separate features and bugs independently from the production code. + +- Commits: Snapshots of the repository. Commit history documents individual changes and helps manage the codebase. + +- Staging Area: A critical concept where you stage your files before committing, indicating which files have changed. + +- Merging: The process of integrating changes from different branches. + +**Repository** +- Definition: The basic element of Git, where all your code and files are stored. Changes are maintained and typically stored in a hosting service like GitHub. + +- Collaboration: Multiple people can access this repository, making collaborative work efficient. + +**Branch** +- Function: A branch allows you to work on individual parts without risking breaking the main code. + +- Analogy: Think of it like a tree branch; the root is the base branch, and the individual branches are separate features or bug fixes. + +- Merge: After working on a feature, it’s common to merge that branch back into the main code. + +**Commits** +- Definition: Commits stem from the main part of branches and represent snapshots of your repository. + +- History: Commit history is a documented record of changes, with each commit accompanied by a message. + +- HEAD Pointer: A concept in Git that points to the latest commit in the branch. You can revert to different commits in your version history. + +**Staging Area** +- Working Directory: Your raw code before committing. + +- Staging: Indicating the files you’ve changed and are ready to record. + +- Commit Message: After staging, you write a commit message to document the changes. + +**Merging** +- Process: When you’re done working on a feature branch, you merge it back into the production branch. + +- Head Pointer: Changes to the branch you’re merging into. + +- Merge Conflicts: Can occur when there are conflicting changes in the same file. You need to manually resolve these conflicts. + +**Conclusion** +- Fundamentals: That’s the core of Git! It’s a powerful tool for version control that enhances collaboration, accountability, and feature testing. ### 🧑‍💻 Hands on Section -Continuing with [Git Tutorial](/docs/category/git-version-control) +1. Continuing with [Git Tutorial](/docs/category/git-version-control) +2. Helping members from last meeting make their first commit to this website. (Added Member Modals) ## 🚀 Next Meeting Presentation by Ex-Google/Ex-Redhat software engineer [Mike Dame](https://www.linkedin.com/in/mike-dame-98600b35/) about the value of Open-Source development!