GitHub repository: Abhinavjoshi7/Resolve-merge-conflicts-Exercise-
Created: 2022-10-26T18:38:53Z
Description: Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary. This course guides you through the steps to finding the best merge conflict solution, so your team can keep building.