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

1 Answer

0 votes
by (19.9k points)

A ‘contention’ emerges when the confer that must be consolidated has some adjustment in one place, and the current submit likewise has a chance at a similar place. Git won’t have the capacity to anticipate which change should come first.