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.
Click here to read more about GIT
Click here to read more about Insurance

Related questions

0 votes
asked Sep 5, 2020 in Git by SakshiSharma
0 votes
asked Oct 26, 2020 in Git by AdilsonLima
+1 vote
asked Jul 25, 2019 in Git by SakshiSharma
0 votes
asked Sep 3, 2020 in Git by SakshiSharma
0 votes
asked Feb 17, 2020 in Git by SakshiSharma
+1 vote
asked Jul 25, 2019 in Git by SakshiSharma
...