GitHub repository: prafull74/Merge-conflicts-happen
Created: 2023-01-26T11:12:54Z
Description: A merge conflict occurs when changes are made to the same part of the same file on two different branches. You usually find out about conflicts in a pull request.