Answered step by step
Verified Expert Solution
Link Copied!
Question
1 Approved Answer

9 . Create a branch called test . Make some changes in the master branch. Let there be some changes in the working directory and

9. Create a branch called test. Make some changes in the master branch. Let there be some changes in the working directory and some in the staging area. Make some changes in the test branch as well. Issue the command to show the differences for
a. Working directory vs Staging area
b. Working directory vs Local Repository
c. Staging area vs Local Repository
d. Between two commits
e. Between two tags
f. Local vs Remote Repository
g. Master branch vs test branch
10. Merge the changes from test branch to master branch.
a. FastForward merge
b. Disabling FastForward merge
c. What is the difference between option (a) and option (b)
11. Create a merge conflict situation. Resolve the conflict and merge the changes between the branches.
12. What is the difference between merge and rebase, demonstrate with an example. Explain it.
13. With an example, demonstrate fetch, clone and pull. What is the usecase for these operations. Are they same, different? Explain.
14. Create a new repository in Github/Gitlab, with a README file. While pushing to the remote repository, if the remote branch is ahead of the local repository (new file is added in remote repository, which is not there in local repository) and pull is failing, how do you solve this problem?

Step by Step Solution

There are 3 Steps involved in it

Step: 1

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

Genomes And Databases On The Internet A Practical Guide To Functions And Applications

Authors: Paul Rangel

1st Edition

189848631X, 978-1898486312

More Books

Students explore these related Databases questions

Question

A 300N F 30% d 2 m Answered: 1 week ago

Answered: 3 weeks ago