GitHub repository: Honkerberg/git-conflict-example
Primary language: Python
Created: 2025-05-29T12:59:19Z
Description: Showcase how to solve git conflicts in Pycharm