• Home
  • Recent Q&A
  • Java
  • Cloud
  • JavaScript
  • Python
  • SQL
  • PHP
  • HTML
  • C++
  • Data Science
  • DBMS
  • Devops
  • Hadoop
  • Machine Learning
in Git by
Q:
What is a ‘conflict’ in git?

1 Answer

0 votes
by
Git can handle on its own most merges by using its automatic merging features. There arises a conflict when two separate branches have made edits to the same line in a file, or when a file has been deleted in one branch but edited in the other. Conflicts are most likely to happen when working in a team environment.

Related questions

0 votes
asked Oct 15, 2019 in Git by rajeshsharma
0 votes
asked Apr 18, 2020 in Git Slack Integration by SakshiSharma
...