Interested to Buy Any Domain ? << Click Here >> for more details...
What is a “conflict” in git and how is it resolved?
- 1 Answers
- 8 Views
- I also Faced
- E-Mail Answers
Answer / Havaladar Yadav
A conflict in Git occurs when two or more branches have made conflicting changes to the same file. This can happen during a merge or pull request.nnTo resolve a conflict, Git presents the affected files with markers indicating where the conflicts occur. Users must manually review and edit these files to reconcile their differences before committing the changes.
| Is This Answer Correct ? | 0 Yes | 0 No |
Describe the branching strategies you have used.
Name a few git commands?
How do you find a list of files that have changed in a particular commit?
What is ‘head’ in git?
Name a few git commands and explain their usage.
How is git instaweb used?
Explain git stash, pop?
What is GIT stash?
What are the advantages of using GIT?
What work is restored when the deleted branch is recovered?
Explain the gitflow workflow?
What is a repository in GIT?
VSS 
