GitHub repository: ziginsider/gitapp
Primary language: Java
Description: Git resolve conflict between branches