0 votes
in Git by (23.1k points)
What is a ‘conflict’ in git?

1 Answer

0 votes
by (13.0k points)
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.
Click here to read more about GIT
Click here to read more about Insurance

Related questions

0 votes
0 votes
asked Sep 5, 2020 in Git by SakshiSharma (30.8k points)
0 votes
0 votes
asked Oct 15, 2019 in Git by rajeshsharma (23.1k points)
0 votes
0 votes
asked Apr 18, 2020 in Git Slack Integration by SakshiSharma (30.8k points)
...