0 votes
in Git Slack Integration by

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. 

Related questions

0 votes
asked Apr 18, 2020 in Git Slack Integration by SakshiSharma
+2 votes
asked Jul 26, 2019 in Git Slack Integration by sheetalkhandelwal
...