GitHub repository: paustint/sfdc-dev-bootcamp-pilot-merge-conflict-ex
Primary language: Apex
Description: Example of resolving merge conflicts