Answered step by step
Verified Expert Solution
Link Copied!

Question

1 Approved Answer

Simulate a Merge Conflict E. Introduce a merge conflict with the Test branch by doing the following: add the git version number to the

imageimageimageimageimage

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

Step by Step Solution

There are 3 Steps involved in it

Step: 1

1 Setup Your Git Repository Before we begin ensure that you have a local Git repository set up and that you are on the Working branch Check Out the Wo... blur-text-image

Get Instant Access to Expert-Tailored Solutions

See step-by-step solutions with expert insights and AI powered tools for academic success

Step: 2

blur-text-image_2

Step: 3

blur-text-image_3

Ace Your Homework with AI

Get the answers you need in no time with our AI-driven, step-by-step assistance

Get Started

Recommended Textbook for

Income Tax Fundamentals 2013

Authors: Gerald E. Whittenburg, Martha Altus Buller, Steven L Gill

31st Edition

1111972516, 978-1285586618, 1285586611, 978-1285613109, 978-1111972516

More Books

Students also viewed these Algorithms questions