+
+
+
+ Katie Shi - LinkedIn - katieshi413@gmail.com
+Emily Choi - LinkedIn - eemilychoi@gmail.com
+Jocelyn Margarones - LinkedIn - katieshi@uw.edu
+Mor Vered - LinkedIn - mvered9@gmail.com
+Mira Nair - LinkedIn - miranair004@gmail.com
+ + + + +[contributors-shield]: https://img.shields.io/github/contributors/katieshi413/open-devsecops.github.io?style=for-the-badge&color=rgb(68%2C%20204%2C%2017) +[contributors-url]: https://github.com/katieshi413/open-devsecops.github.io/graphs/contributors +[commits-shield]: https://img.shields.io/github/commit-activity/t/katieshi413/open-devsecops.github.io?style=for-the-badge +[commits-url]: https://github.com/katieshi413/open-devsecops.github.io/commits/main/ +[Jekyll]: https://img.shields.io/static/v1?style=for-the-badge&message=Jekyll&color=CC0000&logo=Jekyll&logoColor=FFFFFF&label= +[Jekyll-url]: https://jekyllrb.com/ +[Ruby]: https://img.shields.io/badge/Ruby-CC342D?logo=Ruby&logoColor=white +[Ruby-url]: https://www.ruby-lang.org/en/ +[Markdown]: https://img.shields.io/badge/markdown-%23000000.svg?style=for-the-badge&logo=markdown&logoColor=white +[Markdown-url]: https://www.markdownguide.org/ diff --git a/_config.yml b/_config.yml index a66183b..d2cb8a3 100644 --- a/_config.yml +++ b/_config.yml @@ -24,4 +24,8 @@ callouts: color: blue lab: title: Access The Lab - color: purple \ No newline at end of file + color: purple + +sass: + sass_dir: _sass + style: compressed diff --git a/_data/quizzes/topic2/chapter1.yml b/_data/quizzes/topic2/chapter1.yml new file mode 100644 index 0000000..2740540 --- /dev/null +++ b/_data/quizzes/topic2/chapter1.yml @@ -0,0 +1,44 @@ +questions: + - prompt: "What is the primary purpose of version control in software development?" + options: + - "It prevents unauthorized users from editing a file." + - "It allows developers to track changes, collaborate, and revert to previous versions of files if necessary." + - "It automates the process of building software from source code." + - "It helps manage user authentication systems in a project." + correct_index: 1 + explanation: "Version control allows developers to track changes, collaborate, and revert to previous versions of files if necessary. This helps maintain a history of changes and prevents conflicts when working collaboratively." + + - prompt: "What is one of the key advantages of using version control in the scenario where Armine and Tigran are working on the same project?" + options: + - "Version control allows them to share the same file without needing to merge their changes." + - "It ensures that both of their changes are automatically merged, without requiring them to review the changes." + - "It enables them to track their changes independently and merge their updates later, preventing conflicts." + - "It prevents them from making any changes to each other's files." + correct_index: 2 + explanation: "Version control enables Armine and Tigran to track their changes independently and merge their updates later, preventing conflicts. This process is essential when multiple developers are working on the same codebase." + + - prompt: "True or False: Version control systems, like GitHub, prevent all types of conflicts between developers working on the same project by automatically merging all changes." + options: + - "True" + - "False" + correct_index: 1 + explanation: "False. Version control systems help manage changes and alert developers to conflicts, but they do not automatically merge all changes. Developers must manually resolve conflicts." + + - prompt: "Which of the following is NOT true about version control systems?" + options: + - "They allow developers to view the history of changes made to files and revert to any previous state." + - "They can automatically detect and resolve any conflicts between different versions of a file." + - "They facilitate collaboration by allowing multiple developers to work on different parts of a project without interfering with each other." + - "They store different versions of files, enabling developers to work on multiple features simultaneously." + correct_index: 1 + explanation: "Version control systems help detect conflicts, but they do not automatically resolve them. Developers must review and merge conflicting changes manually." + + - prompt: "Which of the following best describes how GitHub helps in the version control process?" + options: + - "GitHub is used exclusively for backing up files and does not include version control features." + - "GitHub only serves as a cloud-based storage system for completed software projects and does not support versioning." + - "GitHub is a platform for organizing and managing tasks related to software development but does not play a role in version control." + - "GitHub integrates with version control systems to store files and track changes, while also providing a user interface for collaboration and version history." + correct_index: 3 + explanation: "GitHub is a version control platform that integrates with Git to store files, track changes, and provide collaboration features like issue tracking, pull requests, and version history." + diff --git a/_data/quizzes/topic2/chapter2.yml b/_data/quizzes/topic2/chapter2.yml new file mode 100644 index 0000000..493a92e --- /dev/null +++ b/_data/quizzes/topic2/chapter2.yml @@ -0,0 +1,41 @@ +questions: + - prompt: "In Git, all changes in your working directory are committed to the repository when you rungit commit, even if they haven't been added to the staging area."
+ options:
+ - "True"
+ - "False"
+ correct_index: 1
+ explanation: "False — Only changes that have been added to the staging area using git add will be included in a commit. Unstaged changes in the working directory are not committed."
+
+ - prompt: "What happens when you run the command git checkout <branch-name>?"
+ options:
+ - "It creates a new branch called <branch-name> but doesn't switch to it."
+ - "It deleted the <branch-name> branch from the respository."
+ - "It uploads your changes to the remote repository."
+ - "It switches your local branch to <branch-name> and updates the working directory with that branch's files."
+ correct_index: 3
+ explanation: "git checkout <branch-name> switches to the specified branch and updates the working directory with that branch's contents."
+
+ - prompt: "In Git, the term _________ refers to a snapshot of your project at a specific point in time, which is stored in the repository after running git commit."
+ options:
+ - "Working Directory"
+ - "Staging Area"
+ - "Commit"
+ - "Branch"
+ correct_index: 2
+ explanation: "A commit in Git represents a snapshot of your project at a specific point in time."
+
+ - prompt: "Which of the following statements is FALSE regarding Git branches?"
+ options:
+ - "A branch in Git does not copy files but simply creates a new pointer to them."
+ - "You can use branches to experiment with new features without affecting the main codebase."
+ - "Once a branch is created, it automatically merges into the main branch after a set period."
+ - "A branch isolates development work, enabling concurrent tasks without conflicts."
+ correct_index: 2
+ explanation: "A branch does NOT automatically merge into the main branch; you have to do it manually using git merge."
+
+ - prompt: "If you delete a branch using git branch -d <branch-name>, the branch is permanently deleted from both your local and remote repositories."
+ options:
+ - "True"
+ - "False"
+ correct_index: 1
+ explanation: "git branch -d only deletes the LOCAL branch. To delete a branch from the remote, you would use git push origin --delete <branch-name>."
diff --git a/_includes/head_custom.html b/_includes/head_custom.html
index 3a75c49..543ff78 100644
--- a/_includes/head_custom.html
+++ b/_includes/head_custom.html
@@ -1,5 +1,6 @@
+
\ No newline at end of file
diff --git a/_includes/nav_footer_custom.html b/_includes/nav_footer_custom.html
index c215dc8..91f8058 100644
--- a/_includes/nav_footer_custom.html
+++ b/_includes/nav_footer_custom.html
@@ -1,3 +1,112 @@
\ No newline at end of file
+
+ Answer the questions below to test your knowledge!
+ + + + + diff --git a/_layouts/custom.html b/_layouts/custom.html index 63d4e2d..10baff5 100644 --- a/_layouts/custom.html +++ b/_layouts/custom.html @@ -33,5 +33,18 @@ {% if site.mermaid %} {% include components/mermaid.html %} {% endif %} + + + + + +