Create a file named ".gitignore" in the git-repo-management directory. Using Visual Studio Code, type .DS_Store in the ".gitignore" file. Save it. Make sure Visual Studio Code added a new line so that there are two lines in it. The file should look like the following screenshot. Close it.
example .gitignore file
Now, initialize a Git repository in the git-repo-management directory. Stage all files in the repository (add the files to the staging area). Commit the files to the repository on the "master" branch.
Note: The auto-grader requires that this branch is called master rather than another name such as main. If you have git set with a different name for the default branch, run the command git branch -m master to rename this branch to master.
Create a branch named "drawings". Check out the "drawings" branch. In the "images" directory, create a subdirectory named "drawings". Move the following files from the "images" directory into the "drawings" subdirectory:
[login to view URL]
[login to view URL]
[login to view URL]
In the "[login to view URL]" file, add a new line after the line that reads <h1>Drawing and Pictures</h1>. Type in the following lines of code.
<img src="images/drawings/[login to view URL]">
<img src="images/drawings/[login to view URL]">
<img src="images/drawings/[login to view URL]">
Make sure that it is indented exactly the same as the <h1>. The content should look like this.
[login to view URL] content
Save the file.
The file structure should look like this.
.
├── images
│ ├── drawings
│ │ ├── [login to view URL]
│ │ ├── [login to view URL]
│ │ └── [login to view URL]
│ ├── [login to view URL]
│ └── [login to view URL]
└── [login to view URL]
Commit all of these changes to the "drawings" branch.
Check out the "master" branch. Create a new branch named "pictures". Check out the new branch named "pictures". In the "images" directory, create a subdirectory named "pictures". Move the following files from the "images" directory to the "pictures" subdirectory.
[login to view URL]
[login to view URL]
In the "[login to view URL]" file, add a new line after the line that reads <h1>Drawing and Pictures</h1>. Type in the following lines of code.
<img src="images/pictures/[login to view URL]">
<img src="images/pictures/[login to view URL]">
Make sure that it is indented exactly the same as the <h1>. The content should look like this.
[login to view URL] content
Save the file.
The file structure should look like this.
git-repo-management
├── images
│ ├── [login to view URL]
│ ├── [login to view URL]
│ ├── pictures
│ │ ├── [login to view URL]
│ │ └── [login to view URL]
│ └── [login to view URL]
└── [login to view URL]
Commit all of these changes to the "pictures" branch.
Check out the "master" branch. Create a new branch named "together". Check out the "together" branch. Merge the "drawings" branch to the "together" branch. Merge the "pictures" branch to the "together" branch. Fix any merge conflict by making sure the img tags are in the order as seen below in the screenshot.
[login to view URL] content
The file structure should look like this.
git-repo-management
├── images
│ ├── drawings
│ │ ├── [login to view URL]
│ │ ├── [login to view URL]
│ │ └── [login to view URL]
│ └── pictures
│ ├── [login to view URL]
│ └── [login to view URL]
└── [login to view URL]
Complete the merge.
Checkout the "master" branch. Delete the file "images/[login to view URL]". Commit the change.
Merge the "together" branch into the "master" branch. Fix the conflict by removing the "[login to view URL]" from the file system. In the "[login to view URL]", remove the line that has the "[login to view URL]" image on it.
[login to view URL] content
Commit all of those changes: the merge, the removal of "[login to view URL]", and the modification of "[login to view URL]".
To submit this assessment:
On macOS:
In your Downloads directory, right click or two-finger tap the "git-repo-management" directory.
Choose "Compress git-repo-management".
Upload the "[login to view URL]" file.
Hello
I Understand your requirement but i have few doubts, text me so i can clear all my doubts
right away, I can help you and i am ready for work.
Thank you.
I have good experience and knowledge on git. I have worked in Source Code Management (Version Control System) tools like Git, GitLab. Implemented and manage continuous code build and deployment with Git and Puppet • Worked in automation using shell scripting mainly bash. Automation using python in operations and Infra support.