in Git Slack Integration by
Q:

What is conflict situation in the Git and how it can be solved?

1 Answer

0 votes
by

Conflict is a situation when both the commits that need to be merged have changes at the same place. This often confuses the software which change should be taken into consideration and which one should be neglected. The best manner to solve this concern is to simply edit the files through the appropriate procedure. 

Click here to read more about GIT
Click here to read more about Insurance

Related questions

0 votes
asked Apr 18, 2020 in Git Slack Integration by SakshiSharma
0 votes
asked Mar 8, 2020 in Git Slack Integration by Hodge
+1 vote
asked Jan 20, 2020 in DevOps by AdilsonLima
0 votes
asked Apr 18, 2020 in Git Slack Integration by SakshiSharma
+1 vote
asked Sep 10, 2020 in Cyber Security by Hodge
...