Simulate a Merge Conflict E. Introduce a merge conflict with the Test branch by doing the...
Fantastic news! We've Found the answer you've been seeking!
Question:
Transcribed Image Text:
Simulate a Merge Conflict E. Introduce a merge conflict with the "Test" branch by doing the following: add the git version number to the README.md file on the Working branch merge the "Test" branch to the Working branch in your local repository include a screenshot that demonstrates the conflict of this merge command line action and be sure to have your repository name visible in the command prompt 1. Resolve the created conflict and push the changes to the Working branch in GitLab. Include a screenshot of the current repository graph in GitLab. bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ echo "Git version: 2.43.0.windows.1" >> README.md bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git add README.md warning: in the working copy of 'Downloads/README.md', LF will be replaced by LF the next time Git touches it bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git commit -m "Add Git version to README.md on Working branch" [Working 712afba] Add Git version to README.md on Working branch 2 files changed, 97 insertions (+) create mode 100644 Downloads/README.md create mode 100644 README.md bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git merge Test Already up to date. bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git add README.md bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git commit -m "Merge branch 'Test' into Working" warning: could not open directory 'Application Data/': Permission denied warning: could not open directory 'Cookies/': Permission denied warning: could not open directory 'Local Settings/': Permission denied warning: could not open directory 'My Documents/': Permission denied warning: could not open directory 'NetHood/': Permission denied warning: could not open directory 'PrintHood/': Permission denied warning: could not open directory 'Recent/': Permission denied warning: could not open directory 'SendTo/': Permission denied warning: could not open directory 'Start Menu/': Permission denied warning: could not open directory 'Templates/': Permission denied On branch Working bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git push origin Working To https://gitlab.com/wgu-gitlab-environment/student-repos/cbarf10/d197-version- control.git ! [rejected] Working -> Working (fetch first) error: failed to push some refs to 'https://gitlab.com/wgu-gitlab-environment/st udent-repos/cbarf10/d197-version-control.git' hint: Updates were rejected because the remote contains work that you do not hint: have locally. This is usually caused by another repository pushing to hint: the same ref. If you want to integrate the remote changes, use hint: 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git push origin Test Everything up-to-date Simulate a Merge Conflict E. Introduce a merge conflict with the "Test" branch by doing the following: add the git version number to the README.md file on the Working branch merge the "Test" branch to the Working branch in your local repository include a screenshot that demonstrates the conflict of this merge command line action and be sure to have your repository name visible in the command prompt 1. Resolve the created conflict and push the changes to the Working branch in GitLab. Include a screenshot of the current repository graph in GitLab. bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ echo "Git version: 2.43.0.windows.1" >> README.md bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git add README.md warning: in the working copy of 'Downloads/README.md', LF will be replaced by LF the next time Git touches it bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git commit -m "Add Git version to README.md on Working branch" [Working 712afba] Add Git version to README.md on Working branch 2 files changed, 97 insertions (+) create mode 100644 Downloads/README.md create mode 100644 README.md bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git merge Test Already up to date. bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git add README.md bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git commit -m "Merge branch 'Test' into Working" warning: could not open directory 'Application Data/': Permission denied warning: could not open directory 'Cookies/': Permission denied warning: could not open directory 'Local Settings/': Permission denied warning: could not open directory 'My Documents/': Permission denied warning: could not open directory 'NetHood/': Permission denied warning: could not open directory 'PrintHood/': Permission denied warning: could not open directory 'Recent/': Permission denied warning: could not open directory 'SendTo/': Permission denied warning: could not open directory 'Start Menu/': Permission denied warning: could not open directory 'Templates/': Permission denied On branch Working bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git push origin Working To https://gitlab.com/wgu-gitlab-environment/student-repos/cbarf10/d197-version- control.git ! [rejected] Working -> Working (fetch first) error: failed to push some refs to 'https://gitlab.com/wgu-gitlab-environment/st udent-repos/cbarf10/d197-version-control.git' hint: Updates were rejected because the remote contains work that you do not hint: have locally. This is usually caused by another repository pushing to hint: the same ref. If you want to integrate the remote changes, use hint: 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. bandz@DESKTOP-EC2J1PU MINGW64 ~/Downloads (Working) $ git push origin Test Everything up-to-date
Expert Answer:
Related Book For 
Income Tax Fundamentals 2013
ISBN: 9781285586618
31st Edition
Authors: Gerald E. Whittenburg, Martha Altus Buller, Steven L Gill
Posted Date:
Students also viewed these algorithms questions
-
Create a repository by doing the following:Note: Screenshots should include the git response from the command prompt or the entire graph window.Note: All operations should be performed on your local...
-
Planning is one of the most important management functions in any business. A front office managers first step in planning should involve determine the departments goals. Planning also includes...
-
Equation 11.14 can be expressed in "coordinate-free" form by writing P0 cos = P0 r. Do so, and likewise for Eqs. 11.17, 11.18. 11.19, and 11.21.
-
By using the Bohr model, decide which element is likely to emit a Ka X-ray with a wavelength of 4.5 x 10-9 m.
-
Is it correct to say that a stone dropped from a bridge into the water speeds up as it falls because the acceleration due to gravity increases as the stone gets closer to Earth?
-
DJ Slick was a radio show host on WLTO-FM, based in Lexington, Kentucky. As a promotional, he announced that he would reward loyal listeners with a chance to win one hundred grand by calling the...
-
Joe, a resident of New Jersey, wants to open a restaurant. He asks Kay, his friend, an experienced attorney and a New Yorker, for her business and legal advice in exchange for a 20 percent ownership...
-
QUESTION ONE a) Distinguish between sale and agreement to sell b) Explain the rights of unpaid seller against the goods c) Explain the nature of the contract of hire purchase QUESTION TWO (5 marks)...
-
You've been hired by SlipStream Inc., a rapidly growing privately held company. After experiencing rapid growth, they're interested in an IPO. SlipStream Inc. understands that to do so, their...
-
Using the nomograph provided overleaf and the following information, suggest a series of size and mass reduction steps to yield an appropriately sampled 0.5 g analytical sample of ore. (you need to...
-
You are servicing a warm reach-in with a cap tube system. The customer says it runs, but at a temperature 10F to 20F higher than normal, and the product entering the box is from a properly operating...
-
3. The following scheme describes reactions within a fatty acid synthetase. Complete the scheme with correct structures and draw the curved arrows to show how each structure is formed. thlo...
-
How were Dr. Bob and Jeffrey able to get so much done for so little money? How could you apply this in starting your own business? 3) Dr. Bob had tried traditional media and pursuing traditional...
-
Why is choosing a country that is culturally similar to the United States particularly important for Pioneering Health, as opposed to a different type of company? When thinking about international...
-
Thermal neutrons are incident on a slab of water 30 cm thick. As the neutrons diffuse about in the slab, they disappear by radiative capture in hydrogen according to the reaction 'H(n, y)*H, where...
-
Subprime loans have higher loss rates than many other types of loans. Explain why lenders offer subprime loans. Describe the characteristics of the typical borrower in a subprime consumer loan.
-
William sold Section 1245 property for $25,000 in 2012. The property cost $35,000 when it was purchased 5 years ago. The depreciation claimed on the property was $16,000. a. Calculate the adjusted...
-
Diane is a single taxpayer who qualifies for the earned income credit. Diane has two qualifying children who are 3 and 5 years old. During 2012, Diane's wages are $17,100 and she receives dividend...
-
David and Darlene Jasper have one child, Sam, who is 6 years old. The Jaspers reside at 4639 Honeysuckle Lane, Los Angeles, CA 90248. David's Social Security number is 577-11-3311, Darlene's is...
-
If \(X\) is a positive random variable, prove that its negative moments are given by, for \(r>0\) : (a) \(\quad \mathbb{E}\left(X^{-r} ight)=\frac{1}{\Gamma(r)} \int_{0}^{\infty} t^{r-1}...
-
Let \(X \stackrel{\text { law }}{=} \mathcal{N}\left(m, \sigma^{2} ight)\) and \(\lambda>0\). Prove that \[\mathbb{E}\left(e^{-\lambda X^{2}} ight)=\frac{1}{\sqrt{1+2 \lambda \sigma^{2}}} \exp...
-
One might naively think that a collection \(\left(X_{t}, t \in \mathbb{R}^{+} ight)\)of independent r.v's may be chosen "measurably," i.e., with the map \[\left(\mathbb{R}^{+} \times \Omega,...
Study smarter with the SolutionInn App