Try GitKraken free | Easy merge conflict fix
SponsoredElevate your team's productivity with GitKraken. Start for free today. Make Git easie…Free Download · Latest release: 10.3.0 · Powerful Git CLI
Brands: GitKraken Desktop, GitKraken CLI, GitLens for VS Code, Git Integration for Jira