I need a GIT professional
Budget: $30 – $250 USD
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:
joseph-roulin.jpg
lands-end.jpg
stag-beetle.jpg
In the "site.html" 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/lands-end.jpg">
<img src="images/drawings/stag-beetle.jpg">
<img src="images/drawings/joseph-roulin.jpg">
Make sure that it is indented exactly the same as the <h1>. The content should look like this.
site.html content
Save the file.
The file structure should look like this.
.
├── images
│ ├── drawings
│ │ ├── joseph-roulin.jpg
│ │ ├── lands-end.jpg
│ │ └── stag-beetle.jpg
│ ├── pearblossom-hwy.jpg
│ └── specimens.jpg
└── site.html
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.
pearblossom-hwy.jpg
specimens.jpg
In the "site.html" 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/pearblossom-hwy.jpg">
<img src="images/pictures/specimens.jpg">
Make sure that it is indented exactly the same as the <h1>. The content should look like this.
site.html content
Save the file.
The file structure should look like this.
git-repo-management
├── images
│ ├── joseph-roulin.jpg
│ ├── lands-end.jpg
│ ├── pictures
│ │ ├── pearblossom-hwy.jpg
│ │ └── specimens.jpg
│ └── stag-beetle.jpg
└── site.html
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.
site.html content
The file structure should look like this.
git-repo-management
├── images
│ ├── drawings
│ │ ├── joseph-roulin.jpg
│ │ ├── lands-end.jpg
│ │ └── stag-beetle.jpg
│ └── pictures
│ ├── pearblossom-hwy.jpg
│ └── specimens.jpg
└── site.html
Complete the merge.
Checkout the "master" branch. Delete the file "images/lands-end.jpg". Commit the change.
Merge the "together" branch into the "master" branch. Fix the conflict by removing the "lands-end.jpg" from the file system. In the "site.html", remove the line that has the "lands-end.jpg" image on it.
site.html content
Commit all of those changes: the merge, the removal of "lands-end.jpg", and the modification of "site.html".
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 "git-repo-management.zip" file.
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:
joseph-roulin.jpg
lands-end.jpg
stag-beetle.jpg
In the "site.html" 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/lands-end.jpg">
<img src="images/drawings/stag-beetle.jpg">
<img src="images/drawings/joseph-roulin.jpg">
Make sure that it is indented exactly the same as the <h1>. The content should look like this.
site.html content
Save the file.
The file structure should look like this.
.
├── images
│ ├── drawings
│ │ ├── joseph-roulin.jpg
│ │ ├── lands-end.jpg
│ │ └── stag-beetle.jpg
│ ├── pearblossom-hwy.jpg
│ └── specimens.jpg
└── site.html
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.
pearblossom-hwy.jpg
specimens.jpg
In the "site.html" 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/pearblossom-hwy.jpg">
<img src="images/pictures/specimens.jpg">
Make sure that it is indented exactly the same as the <h1>. The content should look like this.
site.html content
Save the file.
The file structure should look like this.
git-repo-management
├── images
│ ├── joseph-roulin.jpg
│ ├── lands-end.jpg
│ ├── pictures
│ │ ├── pearblossom-hwy.jpg
│ │ └── specimens.jpg
│ └── stag-beetle.jpg
└── site.html
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.
site.html content
The file structure should look like this.
git-repo-management
├── images
│ ├── drawings
│ │ ├── joseph-roulin.jpg
│ │ ├── lands-end.jpg
│ │ └── stag-beetle.jpg
│ └── pictures
│ ├── pearblossom-hwy.jpg
│ └── specimens.jpg
└── site.html
Complete the merge.
Checkout the "master" branch. Delete the file "images/lands-end.jpg". Commit the change.
Merge the "together" branch into the "master" branch. Fix the conflict by removing the "lands-end.jpg" from the file system. In the "site.html", remove the line that has the "lands-end.jpg" image on it.
site.html content
Commit all of those changes: the merge, the removal of "lands-end.jpg", and the modification of "site.html".
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 "git-repo-management.zip" file.