Part 3 (Terminal 1) 1. Go back to the first terminal 2. Make sure to be in branch "main" 3. Edit file myinfo.txt and add your phone number in a separate line (feel free to use a fake phone number) 4. Commit the file to your local repo with comment "Edited myinfo file for the third time" 5. Push the main to the remote repository. To do so, you will have to suitably pull changes from the remote repository and handle conflicts. In handling conflicts, make sure not to lose any content, not to have any of the extra text added by Git to mark the conflicting parts, and to preserve the order of the information as it appears in the assignment (i.e.. first and last name, zip code, GitHub Username, and phone number). Use commit message "Final merge with conflicts fixed" for the additional commit after merging and handling the conflicts. 6. Tag the current version of the main as "V1" and push the tag to the remote repository. Use a lightweight tag.

Database System Concepts
7th Edition
ISBN:9780078022159
Author:Abraham Silberschatz Professor, Henry F. Korth, S. Sudarshan
Publisher:Abraham Silberschatz Professor, Henry F. Korth, S. Sudarshan
Chapter1: Introduction
Section: Chapter Questions
Problem 1PE
icon
Related questions
Question
I NEED YOU TO EXPLAIN HOW TO DO IT. i don’t need you to do it on GIT. Just explain the steps. Stop returning the question as im not asking for you to do it on GIT.
9:31
Part 3 (Terminal 1)
1. Go back to the first terminal
2. Make sure to be in branch "main"
LTE O
3. Edit file myinfo.txt and add your phone number in a separate line (feel free to use a
fake phone number)
4. Commit the file to your local repo with comment "Edited myinfo file for the third time"
5. Push the main to the remote repository. To do so, you will have to suitably pull changes
from the remote repository and handle conflicts. In handling conflicts, make sure not to
lose any content, not to have any of the extra text added by Git to mark the conflicting
parts, and to preserve the order of the information as it appears in the assignment (i.e.,
first and last name, zip code, GitHub Username, and phone number). Use commit
message "Final merge with conflicts fixed" for the additional commit after merging and
handling the conflicts.
6. Tag the current version of the main as "V1" and push the tag to the remote repository.
Use a lightweight tag.
Transcribed Image Text:9:31 Part 3 (Terminal 1) 1. Go back to the first terminal 2. Make sure to be in branch "main" LTE O 3. Edit file myinfo.txt and add your phone number in a separate line (feel free to use a fake phone number) 4. Commit the file to your local repo with comment "Edited myinfo file for the third time" 5. Push the main to the remote repository. To do so, you will have to suitably pull changes from the remote repository and handle conflicts. In handling conflicts, make sure not to lose any content, not to have any of the extra text added by Git to mark the conflicting parts, and to preserve the order of the information as it appears in the assignment (i.e., first and last name, zip code, GitHub Username, and phone number). Use commit message "Final merge with conflicts fixed" for the additional commit after merging and handling the conflicts. 6. Tag the current version of the main as "V1" and push the tag to the remote repository. Use a lightweight tag.
9:32
Part 1 (Terminal 1)
Before you start, make sure to specify your name and email address using command "git
config", if you haven't already.
1. Open a terminal window
2. Create and go to directory Userl
3. Clone REPO
4. This should create a directory called 370Spring24<firstname-lastname> under
directory Userl.
5. Go to directory 370Spring24<firstname-lastname> (here you can also open the
Network view in GitHub and start monitoring how your repository evolves)
6. Make sure that the directory contains a file called README.md
7. Create and go to directory Assignment2 (under
370Spring24<firstname-lastname>)
8.
Create a file called myinfo.txt that contains only one line with your first and last name
9. Commit the file to your local repo with comment "Added myinfo file"
10. Create a branch called "development and switch to it
11. Create a file called dev1.txt that contains the text "Dev 1 file".
LTE O
12. Commit the file to your local repo (it should be in branch "development") with comment
"Added dev1 file"
13. Switch to the "main" branch
14. Edit file myinfo.txt and add your zip code in a separate line (feel free to make up the
code, if you don't want to use yours)
15. Commit the file to your local repo with comment "Edited myinfo file"
16. Merge the "development" branch into the "main" branch with commit message "Merge
#1"
17. Push all branches to the remote repository
Part 2 (Terminal 2)
1. Open a second terminal window
2. Create and go to directory User2
3. Clone REPO
4. Just like before, this should create a directory called
370Spring24<firstname-lastname> under directory User2
5. Go to directory 370Spring24<firstname-lastname>/Assignment2
6. Switch to the development" branch
7. Create a file called dev2.txt that contains the text "Dev 2 file".
8. Commit the file to your local repo (it should be in branch "development") with comment
"Added dev2 file"
9. Create a branch called "temp" and switch to it
10. Create a file called mytemp.txt that contains the text "Mytemp file".
11. Commit the file to your local repo (it should be in branch "temp") with comment "Added
mytemp file
12. Create and commit to the branch "development", with the usual comment, a file called
dev3.txt that contains the text "Dev 3 file"
13. Merge the "temp" branch into the development" branch with commit message "Merge
#2"
14. Merge the "development" branch into the "main" branch with commit message "Merge
#3"
15. In the main branch, edit file myinfo.txt and add your GitHub Username (e.g..
aabreu)
16. Commit the file to your local repo with comment "Edited myinfo file again"
17. Push all branches to the remote repository
Part 3 (Terminal 1)
×
Transcribed Image Text:9:32 Part 1 (Terminal 1) Before you start, make sure to specify your name and email address using command "git config", if you haven't already. 1. Open a terminal window 2. Create and go to directory Userl 3. Clone REPO 4. This should create a directory called 370Spring24<firstname-lastname> under directory Userl. 5. Go to directory 370Spring24<firstname-lastname> (here you can also open the Network view in GitHub and start monitoring how your repository evolves) 6. Make sure that the directory contains a file called README.md 7. Create and go to directory Assignment2 (under 370Spring24<firstname-lastname>) 8. Create a file called myinfo.txt that contains only one line with your first and last name 9. Commit the file to your local repo with comment "Added myinfo file" 10. Create a branch called "development and switch to it 11. Create a file called dev1.txt that contains the text "Dev 1 file". LTE O 12. Commit the file to your local repo (it should be in branch "development") with comment "Added dev1 file" 13. Switch to the "main" branch 14. Edit file myinfo.txt and add your zip code in a separate line (feel free to make up the code, if you don't want to use yours) 15. Commit the file to your local repo with comment "Edited myinfo file" 16. Merge the "development" branch into the "main" branch with commit message "Merge #1" 17. Push all branches to the remote repository Part 2 (Terminal 2) 1. Open a second terminal window 2. Create and go to directory User2 3. Clone REPO 4. Just like before, this should create a directory called 370Spring24<firstname-lastname> under directory User2 5. Go to directory 370Spring24<firstname-lastname>/Assignment2 6. Switch to the development" branch 7. Create a file called dev2.txt that contains the text "Dev 2 file". 8. Commit the file to your local repo (it should be in branch "development") with comment "Added dev2 file" 9. Create a branch called "temp" and switch to it 10. Create a file called mytemp.txt that contains the text "Mytemp file". 11. Commit the file to your local repo (it should be in branch "temp") with comment "Added mytemp file 12. Create and commit to the branch "development", with the usual comment, a file called dev3.txt that contains the text "Dev 3 file" 13. Merge the "temp" branch into the development" branch with commit message "Merge #2" 14. Merge the "development" branch into the "main" branch with commit message "Merge #3" 15. In the main branch, edit file myinfo.txt and add your GitHub Username (e.g.. aabreu) 16. Commit the file to your local repo with comment "Edited myinfo file again" 17. Push all branches to the remote repository Part 3 (Terminal 1) ×
Expert Solution
trending now

Trending now

This is a popular solution!

steps

Step by step

Solved in 3 steps

Blurred answer
Knowledge Booster
Linux
Learn more about
Need a deep-dive on the concept behind this application? Look no further. Learn more about this topic, computer-science and related others by exploring similar questions and additional content below.
Similar questions
  • SEE MORE QUESTIONS
Recommended textbooks for you
Database System Concepts
Database System Concepts
Computer Science
ISBN:
9780078022159
Author:
Abraham Silberschatz Professor, Henry F. Korth, S. Sudarshan
Publisher:
McGraw-Hill Education
Starting Out with Python (4th Edition)
Starting Out with Python (4th Edition)
Computer Science
ISBN:
9780134444321
Author:
Tony Gaddis
Publisher:
PEARSON
Digital Fundamentals (11th Edition)
Digital Fundamentals (11th Edition)
Computer Science
ISBN:
9780132737968
Author:
Thomas L. Floyd
Publisher:
PEARSON
C How to Program (8th Edition)
C How to Program (8th Edition)
Computer Science
ISBN:
9780133976892
Author:
Paul J. Deitel, Harvey Deitel
Publisher:
PEARSON
Database Systems: Design, Implementation, & Manag…
Database Systems: Design, Implementation, & Manag…
Computer Science
ISBN:
9781337627900
Author:
Carlos Coronel, Steven Morris
Publisher:
Cengage Learning
Programmable Logic Controllers
Programmable Logic Controllers
Computer Science
ISBN:
9780073373843
Author:
Frank D. Petruzella
Publisher:
McGraw-Hill Education