root
/
public
mirror of https://github.com/01-edu/public.git
8
9
Fork 0
Code Issues 2 Projects Releases Wiki Activity
Browse Source

fix(git project): readme and audit remake

pull/2516/head
miguel 2 months ago committed by MSilva95
parent
8190768391
commit
b8d285cc67
2 changed files with 299 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 231
      subjects/git/README.md
  2. 168
      subjects/git/audit/README.md

231
subjects/git/README.md
unescape_control_characters View File

@ -2,71 +2,122 @@
### Introduction ### Introduction
The Git project is designed to introduce you to the world of version control and collaboration with Git. This project is designed to introduce you to the world of version control and collaboration using **Git**. Git is a powerful and widely used tool for tracking changes in your projects, collaborating with others, and ensuring the integrity of your code.
Git is a powerful and widely used tool for tracking changes in your projects, collaborating with others,
and ensuring the integrity of your code.
This Git project is structured as a series of exercises. You will progressively build your Git skills, Throughout this project, you will embark on a journey of progressively building your Git skills. Starting from the basics, you'll gradually explore more advanced topics, equipping yourself with the essential knowledge and practices for effective version control and collaboration.
starting from the basics and gradually moving towards more advanced topics.
Let's Git ready for it! Let's Git ready for it!
### Instructions ### Instructions
Put all of your work in a directory `work`, each exercise in a separate file named after the name of the exercise. To begin, create a `work` directory and organize all your tasks within it. Each exercise should be encapsulated in its own file, named after the corresponding task for clarity and ease of reference.
Accompanying your work, provide documentation or a report detailing the process followed for each exercise. This documentation should include any challenges faced, solutions implemented, and lessons learned. It could be in the form of a README file or a separate document. Make sure to show it to the auditor during evaluation.
> ⚠️ Your completion of tasks will be evaluated based on the commit history reflecting the changes made throughout the exercises and the presence of accompanying documentation detailing the process followed.
Here is an example of a file that you can deliver to your auditor to help with the review process:
```md
#### Conflicts, merging and rebasing
# Merge Main into Greeter Branch
<Write the command here>
# Switch to main branch and make changes to hello.rb file
<Write the command here>
# Merging Main into Greeter Branch (Conflict)
<Write the command here>
# Resolve the conflict (manually or using merge tools)
<Write the command here>
# After resolving, stage the changes and commit
<Write the command here>
# Rebasing Greeter Branch
<Write the command here>
# Merging Greeter into Main
<Write the command here>
```
#### Setting Up Git #### Setting Up Git
- Install Git on your local machine by following the instructions for your operating system on the official Git website. - Install Git on your local machine by following the instructions for your operating system on the official [Git website](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
- Configure Git with your name and email address. - Configure Git with your name and email address.
#### Git commits to commit #### Git commits to commit
- In `work` directory, create a folder named `hello` then a file `hello.rb` with the content below: - Within the `work` directory, establish a subdirectory named `hello`. Inside this directory, generate a file titled `hello.rb` and input the following content:
```
puts "Hello, World"
```
- Initialize the git repository in `hello` directory, then add `hello.rb` to the repository.
- Check the status and act accordingly with the output of the executed command.
- Change the “Hello, World” program. Change the file to be
```ruby
puts "Hello, World"
``` ```
- Initialize the git repository in the `hello` directory.
- Check the status and act accordingly with the output of the executed command.
- Change the `hello.rb` content to the following:
```ruby
puts "Hello, #{ARGV.first}!" puts "Hello, #{ARGV.first}!"
``` ```
- Stage the changed file and commit the changes, the working tree should be clean. - Stage the changed file and commit the changes, the working tree should be clean.
- Change again `hello.rb` file and add the file to staging area, make two commits one for the comment in line1, the other for lines 3 and 4. - Modify the `hello.rb` file to include comments and stage it.
``` ```ruby
# Default is "World" # Default is "World"
name = ARGV.first || "World" name = ARGV.first || "World"
puts "Hello, #{name}!" puts "Hello, #{name}!"
``` ```
- Make two separate commits:
- The first commit should be for the comment in line 1.
- The second commit should include changes made to lines 3 and 4.
#### History #### History
- Show the history of the working directory. - Show the history of the working directory.
- Show One line history; only the hashes and commit messages are displayed. - Show One-Line History for a condensed view showing only commit hashes and messages.
- Show logs with control over entries displayed: 2 last entries, since 5 minutes ago, until 5 minutes ago. - **Controlled Entries**:
- Show logs in a personalized format like: `* e4e3645 2023-06-10 | Added a comment (HEAD -> main) [John Doe]` - You need to customize the log output by specifying the number of entries or a time range. Customize it to display the last `2 entries`, to view `commits made within the last 5 minutes` or to see `commits made in the last 5 minutes until now`.
- **Personalized Format**:
- Show logs in a personalized format, including the commit hash, date, message, branch information, and author name, resembling `* e4e3645 2023-06-10 | Added a comment (HEAD -> main) [John Doe]`
#### Check it out #### Check it out
- Restore the first snapshot of your working tree, then print the content of `hello.rb` file. - **Restore First Snapshot**:
- Restore the second recent snapshot and print the content of `hello.rb` file. - Revert the working tree to its initial state, as captured in the first snapshot, and then print the content of the `hello.rb` file.
- Return the latest version in the main branch (do not use commit hash) - **Restore Second Recent Snapshot**:
- Revert the working tree to the second most recent snapshot and print the content of the `hello.rb` file.
- **Return to Latest Version**:
- Ensure that the working directory reflects the latest version of the `hello.rb` file present in the main branch, without referring to specific commit hashes.
#### TAG me #### TAG me
- Refer the current version of the repository as `v1`. - **Referencing Current Version**:
- Tag the version immediately prior to the current version as `v1-beta`, do not use commit hashes to move through the history. - Tag the current version of the repository as `v1`.
- Go back and forth between the two tagged versions. - **Tagging Previous Version**:
- Show the list of tags - Tag the version immediately prior to the current version as `v1-beta`, without relying on commit hashes to navigate through the history.
- **Navigating Tagged Versions**:
- Move back and forth between the two tagged versions, `v1` and `v1-beta`.
- **Listing Tags**:
- Display a list of all tags present in the repository to verify successful tagging.
#### Changed your mind? #### Changed your mind?
- Make the following changes to the latest version of the file, then revert it before staging (Do not use CTRL+Z) - **Reverting Changes**:
- Modify the latest version of the file with unwanted comments, then revert it back to its original state before staging. (Do not use CTRL+Z)
``` ```
# This is a bad comment. We want to revert it. # This is a bad comment. We want to revert it.
@ -75,7 +126,8 @@ name = ARGV.first || "World"
puts "Hello, #{name}!" puts "Hello, #{name}!"
``` ```
- Modify the file to have a bad comment, stage it, then clean the staging area. - **Staging and Cleaning**:
- Introduce unwanted changes to the file, stage them, then clean the staging area to discard the changes.
``` ```
# This is an unwanted but staged comment # This is an unwanted but staged comment
@ -84,7 +136,8 @@ name = ARGV.first || "World"
puts "Hello, #{name}!" puts "Hello, #{name}!"
``` ```
- Add the following changes again, stage the file and commit the changes, then revert it. - **Committing and Reverting**:
- Add the following unwanted changes again, stage the file, commit the changes, then revert them back to their original state.
``` ```
# This is an unwanted but committed change # This is an unwanted but committed change
@ -93,10 +146,14 @@ name = ARGV.first || "World"
puts "Hello, #{name}!" puts "Hello, #{name}!"
``` ```
- Mark the latest commit with `oops` tag, then remove commits coming after `v1` version (HEAD should be in `v1`) - **Tagging and Removing Commits**:
- Show the logs with the deleted commits displayed (eg: log for commit tagged `oops` should be displayed). - Tag the latest commit with `oops`, then remove commits made after the `v1` version. Ensure that the `HEAD` points to `v1`.
- Now make sure the unreferenced commits are deleted from the history (no logs for deleted commits). - **Displaying Logs with Deleted Commits**:
- Add an author comment to the file and commit the changes - Show the logs with the deleted commits displayed, particularly focusing on the commit tagged `oops`.
- **Cleaning Unreferenced Commits**:
- Ensure that unreferenced commits are deleted from the history, meaning there should be no logs for these deleted commits.
- **Author Information**:
- Add an author comment to the file and commit the changes.
``` ```
# Default is World # Default is World
@ -106,12 +163,13 @@ name = ARGV.first || "World"
puts "Hello, #{name}!" puts "Hello, #{name}!"
``` ```
- Oops we forgot the author email, Update the file to include the email. don't make a new commit, but include the change in the last commit. - Oops the author email was forgotten, update the file to include the email without making a new commit, but include the change in the last commit.
#### Move it #### Move it
- Move the program `hello.rb` into a `lib/` directory (use git command) and commit the move. - **Moving hello.rb**:
- Add a Rakefile to the root of the repository and commit it. - Using Git commands, move the program `hello.rb` into a `lib/` directory, and then commit the move.
- Create a `Rakefile` in the root directory of the repository with the provided content and commit it to the repository.
``` ```
#!/usr/bin/ruby -wKU #!/usr/bin/ruby -wKU
@ -125,19 +183,23 @@ end
#### blobs, trees and commits #### blobs, trees and commits
- Explore .git/ directory and explain its contents: `objects/`, `config`, `refs` and `HEAD`. - **Exploring `.git/` Directory**:
- Grab the latest object hash within `.git/object` directory print its type and its content using `git` command. - Navigate to the `.git/` directory in your project and examine its contents.You will have to explain the purpose of each subdirectory, including `objects/`, `config`, `refs`, and `HEAD` in the audit.
- Dump the directory tree referenced in the commit - **Latest Object Hash**:
- Dump the `lib` directory, then `hello.rb` file. - Find the latest object hash within the `.git/objects/` directory using Git commands and print the type and content of this object using Git commands.
- **Dumping Directory Tree**:
- Use Git commands to dump the directory tree referenced by this commit.
- Dump the contents of the `lib/` directory and the `hello.rb` file using Git commands.
#### Branching #### Branching
It’s time to do a major rewrite of the hello world functionality. Since this might take awhile, you’ll want to put these changes into a separate branch to isolate them from changes in main. It’s time to do a major rewrite of the hello world functionality. Since this might take a while, you’ll want to put these changes into a separate branch to isolate them from changes in the main branch.
- Create a local branch named `greet` and switch to it. - **Create and Switch to New Branch**:
- Create `greeter.rb` file in `lib` directory, add the following content to it and commit the changes - Create a local branch named `greet` and switch to it.
- In the `lib` directory, create a new file named `greeter.rb` and add the provided Ruby code to it. Commit these changes.
``` ```ruby
class Greeter class Greeter
def initialize(who) def initialize(who)
@who = who @who = who
@ -148,9 +210,9 @@ class Greeter
end end
``` ```
- Update `lib/hello.rb` file by adding the content below, stage and commit the changes. - Update the `lib/hello.rb` file by adding the content below, stage and commit the changes.
``` ```ruby
require 'greeter' require 'greeter'
# Default is World # Default is World
@ -160,9 +222,9 @@ greeter = Greeter.new(name)
puts greeter.greet puts greeter.greet
``` ```
- Update `lib/Rakefile` too and commit the changes - Update the `lib/Rakefile` with the following content to ensure it runs the updated `lib/hello.rb` file. Commit these changes.
``` ```ruby
#!/usr/bin/ruby -wKU #!/usr/bin/ruby -wKU
task :default => :run task :default => :run
@ -172,68 +234,85 @@ task :run do
end end
``` ```
- Switch to `main` branch, show the difference between the versions in `main` and `greeter` branches for the these files: `Rakefile`, `hello.rb` and `greeter.rb` - Switch back to the `main` branch, compare and show the differences between the `main` and `greet` branches for `Rakefile`, `hello.rb`, and `greeter.rb` files.
- Create `README.md` file with the content below and commit the changes. - Generate a `README.md` file for the project with the provided content. Commit this file.
``` ```console
This is the Hello World example from the git project. This is the Hello World example from the git project.
``` ```
- Draw the commit tree for all the branches to show the diverging changes. - Draw a commit tree diagram illustrating the diverging changes between all branches to demonstrate the branch history.
#### Conflicts, merging and rebasing #### Conflicts, merging and rebasing
- Merge `main` branch into `greeter` branch. - **Merge Main into Greeter Branch**:
- Switch to `main` branch and make the changes below to `hello.rb` save and commit. - Start by merging the changes from the `main` branch into the `greeter` branch.
- Switch to `main` branch and make the changes below to the `hello.rb` file, save and commit the changes.
``` ```ruby
puts "What's your name" puts "What's your name"
my_name = gets.strip my_name = gets.strip
puts "Hello, #{my_name}!" puts "Hello, #{my_name}!"
``` ```
- Now switch to `greeter` branch and try to merge `main` into it (Bingooo! there you have a conflict!). - **Merging Main into Greeter Branch (Conflict)**:
- Resolve the conflict (manually or using graphical merge tools), accept changes from `main` branch, then commit the conflict resolution. - Attempt to merge the `main` branch into `greeter`. Bingooo! There you have it, a `conflict`.
- Go back in time before the very first merge. now rebase the branch `greeter` on top of `main` branch. - Resolve the conflict (manually or using graphical merge tools), accept changes from `main` branch, then commit the conflict resolution.
- Now merge changes from `greeter` into `main` branch. - **Rebasing Greeter Branch**:
- Explain fast-forwarding and the difference between merging and rebasing. - Go back to the point before the initial merge between `main` and `greeter`.
- Rebase the `greeter` branch on top of the latest changes in the `main` branch.
- **Merging Greeter into Main**:
- Merge the changes from the `greeter` branch into the `main` branch.
- **Understanding Fast-Forwarding and Differences**:
- Explain fast-forwarding and the difference between merging and rebasing.
#### Local and remote repositories #### Local and remote repositories
- In `work/` directory make a clone of the repository `hello` as `cloned_hello` (do not use `copy` command). - In the `work/` directory, make a clone of the repository `hello` as `cloned_hello`. (Do not use `copy` command)
- Show the logs for the cloned repository, what are `origin/main`, `origin/greet` and `origin/HEAD` ?.
- Display the name of the remote repository, show more information about it. - Show the logs for the cloned repository.
- List all the remote and local branches.
- Make changes to the original repository, Update `README.md` file and commit the changes. - Display the name of the remote repository and provide more information about it.
- List all remote and local branches in the `cloned_hello` repository.
- Make changes to the original repository, update the `README.md` file with the provided content, and commit the changes.
``` ```
This is the Hello World example from the git project. This is the Hello World example from the git project.
(changed in original) (changed in the original)
``` ```
- Inside the cloned copy fetch the changes from remote and display the logs (commits from `hello` repository should be included in the logs). - Inside the cloned repository (`cloned_hello`), fetch the changes from the remote repository and display the logs. Ensure that commits from the `hello` repository are included in the logs.
- Merge remote `main` branch into local `main` branch.
- What is the single git command equivalent to what you did before to bring changes from remote to local `main` branch? - Merge the changes from the remote `main` branch into the local `main` branch.
- Add a `greet` local branch tracking the remote `origin/greet` branch.
- Add a local branch named `greet` tracking the remote `origin/greet` branch.
- Be ready for this question in the audit!
**"What is the single git command equivalent to what you did before to bring changes from remote to local `main` branch?"**
#### Bare repositories #### Bare repositories
- What is a bare repository and what is it needed for? - What is a bare repository and why is it needed?
- Create a bare repository from `hello` repository and name it `hello.git`. - Create a bare repository named `hello.git` from the existing `hello` repository.
- Add the bare `hello.git` repository as a remote to our original repository `hello`. - Add the bare `hello.git` repository as a remote to the original repository `hello`.
- Change README.md file, commit and push the change to the shared repository. - Change the `README.md` file in the original repository with the provided content:
``` ```
This is the Hello World example from the git project. This is the Hello World example from the git project.
(Changed in the original and pushed to shared) (Changed in the original and pushed to shared)
``` ```
- Quick hop over to the clone repository `cloned_hello` and pull down the changes just pushed to the shared repository. - Commit the changes and push them to the shared repository.
- Switch to the cloned repository `cloned_hello` and pull down the changes just pushed to the shared repository.
### Submission and Evaluation ### Submission and Evaluation
Your work will have to be submitted in the `gitea` link provided. the evaluation will be performed based on your submission and in accordance with the following criteria: Your work must be submitted at the `gitea` link provided. The evaluation will be carried out based on your submission and according to the following criteria:
- Correctness of the git commands you are using. - Correctness of the git commands you are using.
- Clear understanding of the git commands and concepts. - Clear understanding of the git commands and concepts.

168
subjects/git/audit/README.md
unescape_control_characters View File

@ -1,50 +1,142 @@
### Git
> ⚠️ The student is must provide you with a file containing the solutions for each task. Furthermore, they should showcase their commit history on GitHub, facilitating your review of the evolution of their work and the strategies employed to complete each task. This commit history is crucial to the evaluation process. Please ensure that the submission includes both the solution file and the link to the GitHub repository containing the commit history. In the absence of the link, kindly request the student to provide it.
#### Setup and Installation #### Setup and Installation
###### Has the student installed Git on their local machine? ###### Did the student successfully install Git on their local machine?
###### Has the student properly configured Git with a username and email address? ###### Did the student configure Git with a valid username and email address?
#### Git commits to commit #### Git commits to commit
###### Has the file `hello.rb` been created in the proper workspace? ###### Did the student navigate to the `work` directory and create a subdirectory named `hello`?
###### Did the student generate a file named `hello.rb` with the content `puts "Hello, World"` inside the `hello` directory?
###### Did the student initialize a Git repository in the `hello` directory?
###### Is Git initialized in the workspace with the `git init` command? ###### Did the student use the `git status` command to check the status of the repository?
###### Did the student use `git status` to check the status of the working directory? ###### Did the student modify the `hello.rb` file content with the provided `puts "Hello, #{ARGV.first}!"`?
###### Has `hello.rb` file been staged and committed with the appropriate commands `git add` and `git commit`? ###### Did the student stage the modified `hello.rb` file, commit the changes to the repository, and ensure that the working tree is clean afterward?
#### Git History & Logging ###### Did the student further modify the `hello.rb` file to include comments, and then make two separate commits as instructed?
###### Did the student make two separate commits, with the first commit for the comment in line 1 and the second commit for the changes made to lines 3 and 4, as instructed?
#### History
###### Did the student display the Git history of the working directory with `git status` command? ###### Did the student display the Git history of the working directory with `git status` command?
###### Was the student able to display the history in various ways, such as showing only the hashes and commit messages, or controlling the number of entries displayed? ###### Did the student successfully display a condensed view of the Git history, showing only commit hashes and messages using the "One-Line History" format?
###### Was the student able to customize the log output to display the last 2 entries?
###### Did the student successfully demonstrate viewing commits made within the last 5 minutes?
###### Did the student successfully demonstrate viewing commits made in the last 5 minutes until now?
###### Did the student successfully customize the format of Git logs and display them according to this example `* e4e3645 2023-06-10 | Added a comment (HEAD -> main) [John Doe]`?
#### Check it out
###### Did the student successfully restore the first snapshot of the working tree and print the content of `hello.rb`?
###### Did the student successfully restore the second recent snapshot and print the content of `hello.rb`?
###### Did the student ensure that the working directory reflects the latest version of `hello.rb` from the main branch without using commit hashes?
#### TAG me
###### Did the student successfully tag the current version of the repository as `v1`?
###### Did the student successfully tag the version immediately prior to the current version as `v1-beta`, without relying on commit hashes?
###### Did the student navigate back and forth between the two tagged versions, `v1` and `v1-beta`?
###### Did the student display a list of all tags present in the repository to verify successful tagging?
#### Changed your mind?
###### Did the student successfully revert the modifications made to the latest version of the file, restoring it to its original state before staging?
###### Did the student introduce unwanted changes to the file, stage them, and then successfully clean the staging area to discard the changes?
###### Did the student add unwanted changes again, stage the file, commit the changes, and then revert them back to their original state?
###### Did the student tag the latest commit with oops and remove commits made after the v1 version, ensuring that the HEAD points to v1?
###### Did the student display the logs with the deleted commits, particularly focusing on the commit tagged `oops`?
###### Did the student ensure that unreferenced commits were deleted from the history, with no logs remaining for these deleted commits?
###### Did the student add author information to the file and commit the changes?
###### Did the student update the file to include the author email without making a new commit, but included the change in the last commit?
#### Move it
###### Did the student successfully move the hello.rb program into a lib/ directory using Git commands?
###### Did the student customize the format of Git logs and display them accordingly with `git log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short`? ###### Did the student commit the move of hello.rb?
#### Checking Out & Tagging ###### Did the student create and commit a Rakefile in the root directory of the repository with the provided content?
###### Did the student make, revert, and stage changes efficiently in response to the provided instructions? #### blobs, trees and commits
###### Did the student add the 'oops' tag and remove commits following 'v1' as specified? ##### Ask the student to navigate to the `.git/` directory and explain to you the purpose of each subdirectory, including `objects/`, `config`, `refs`, and `HEAD`.
###### Did the student display logs with the deleted commits or without them as instructed? ###### Was the student able to explain the purpose of each subdirectory, including `objects/`, `config`, `refs`, and `HEAD`?
###### Did the student successfully find the latest object hash within the `.git/objects/` directory using Git commands?
###### Was the student able to print the type and content of this object using Git commands?
###### Did the student use Git commands to dump the directory tree referenced by a specific commit?
###### Were they able to dump the contents of the `lib/` directory and the `hello.rb` file using Git commands?
#### Branching, Merging & Rebasing #### Branching, Merging & Rebasing
###### Did the student create and switch to a new branch named 'greet'? ###### Did the student successfully create and switch to a new branch named 'greet'?
###### Did the student create and commited a new file named `greeter.rb` in the `lib` directory with the provided Ruby code in it?
###### Did the student update the `lib/hello.rb` file with the provided content, stage, and commit the changes?
###### Did the student update the `lib/Rakefile` with the provided content to ensure it runs the updated `lib/hello.rb` file, stage, and commit the changes?
###### Was the student able to compare and show the differences between the `main` and `greet` branches for the `Rakefile`, `hello.rb`, and `greeter.rb` files?
###### Did the student generate a `README.md` file with the provided content and commit it?
###### Did the student draw a commit tree diagram illustrating the diverging changes between all branches to demonstrate the branch history?
#### Conflicts, merging and rebasing
###### Did the student successfully merge the changes from the `main` branch into the `greeter` branch?
###### Did the student make the specified changes to the `hello.rb` file in the `main` branch and commit them?
###### Did the student attempt to merge the `main` branch into the `greeter` branch creating a conflict during the merge?
###### Did the student successfully resolve the conflict, accepting changes from the `main` branch?
###### Did the student create a new file, stage it, and make a commit in the 'greet' branch? ###### Did the student commit the conflict resolution changes?
###### Did the student successfully merge changes from 'main' into 'greet' and resolve any conflicts that arose? ###### Did the student return to the point before the initial merge between `main` and `greeter`?
###### Did the student successfully rebased 'greet' branch on top of 'main' branch? ###### Did the student rebase the `greeter` branch on top of the latest changes in the `main` branch?
###### Did the student switch branches, update 'hello.rb' in the 'main' branch, and understand the differences between versions? ###### Did the student successfully merge the changes from the `greeter` branch into the `main` branch?
##### Ask the student about the differences between rebasing and merging ##### Ask the student to explain the difference between merging and rebasing and if he understand Fast-Forwarding.
###### Did the student understand clearly the differences between rebasing and merging? ###### Did the student demonstrate an understanding of fast-forwarding?
###### was the student able to explain the difference between merging and rebasing?
#### Local & Remote Repositories #### Local & Remote Repositories
@ -54,12 +146,40 @@
###### Did the student list both remote and local branches, make changes to the original repository, and synchronize the cloned repository with remote changes? ###### Did the student list both remote and local branches, make changes to the original repository, and synchronize the cloned repository with remote changes?
###### Did the student successfully clone the `hello` repository into the `work/` directory as `cloned_hello`, without using the `copy` command?
###### Did the student show the logs for the `cloned_hello` repository?
###### Did the student display the name of the remote repository (`origin`) and provide more information about it?
###### Did the student list all remote and local branches in the `cloned_hello` repository?
###### Did the student make changes to the original repository, update the `README.md` file with the provided content, and commit the changes?
###### Inside the cloned repository (`cloned_hello`), did the student fetch the changes from the remote repository and display the logs, ensuring commits from the `hello` repository are included?
###### Did the student merge the changes from the remote `main` branch into the local `main` branch?
###### Did the student add a local branch named `greet` tracking the remote `origin/greet` branch?
##### Ask the following question to the student:
**What is the single git command equivalent to what you did before to bring changes from remote to local `main` branch?**
###### Did the student provide an accurate response?
#### Bare Repositories #### Bare Repositories
##### Ask the student about bare repositories ##### Ask the following question to the student:
**What is a bare repository and why is it needed?**
###### Did the student correctly explain what a bare repository is and why it is needed?
###### Did the student successfully create a bare repository named `hello.git` from the existing `hello` repository?
###### Does the student understand the purpose of a bare repository and why it's used? ###### Did the student add the bare `hello.git` repository as a remote to the original repository `hello`?
###### Did the student create a bare repository, add it as a remote, and push changes to it as required? ###### Did the student change the `README.md` file in the original repository, commit the change, and push it to the shared repository?
###### Did the student successfully pull changes from the shared repository in the clone? ###### Did the student switch to the cloned repository `cloned_hello` and successfully pull down the changes just pushed to the shared repository?

Write Preview
Loading…
Cancel
Save