GitHub repository: ErvinLara8/GitMergeConflictDemp
Primary language: Python
Created: 2025-02-04T20:45:40Z
Description: Demo for how to solve a git merge conflict