Answer Posted / 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 |
Post New Answer View All Answers