Interested to Buy Any Domain ? << Click Here >> for more details...
What is a “conflict” in git and how is it resolved?
- 1 Answers
- 3 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 |
Explain what is commit message?
What is git bisect?
How to remove a file from git without removing it from your file system?
What is the difference between git vs svn
How can you create a repository in Git?
How git instaweb is used?
What are git repository hosting services you used?
What is difference between fork and branch?
What is the difference between GIT and SVN?
Name a few Git repository hosting services
What is the command you can use to write a commit message?
What language is used in GIT?
VSS 
