Answered step by step
Verified Expert Solution
Question
1 Approved Answer
Suppose you are two Software Developers- X and Y. X will create a Java Project called MyFancyJavaProject and write up a simple Java program without
Suppose you are two Software Developers- X and Y.
- X will create a Java Project called MyFancyJavaProject and write up a simple Java program without following the Singleton pattern.
- Later, X needs to create a local Git Repository with the MyFancyJavaProject and connect it to a new GitHub Repository.
- X will work on the main branch, commit his changes on Jan 6, and push it to the origin.
- X will then invite the second developer Y, to collaborate with his project.
- Y will clone the whole project into his local machine and create a new branch called branchY.
- Now, Y will checkout to branchY and modify the program to implement Singleton Pattern, commit his changes on Jan 8, and push it to the origin.
- Meanwhile, X will make some slight changes to his code, commit the changes on Jan 9, and then push them to the origin.
- Y will check out to the main branch, pull the latest changes from origin and create a new branch called branchXY.
- Then Y will checkout to branchXY and merge this branch with branchY. After merging, if any conflict arises, he needs to resolve them (e.g., he can keep the codes from branchY).
- Finally, Y will commit the changes on Jan 11, and then push them to the origin.
Use appropriate commit messages.
Step by Step Solution
There are 3 Steps involved in it
Step: 1
Get Instant Access to Expert-Tailored Solutions
See step-by-step solutions with expert insights and AI powered tools for academic success
Step: 2
Step: 3
Ace Your Homework with AI
Get the answers you need in no time with our AI-driven, step-by-step assistance
Get Started