In these videos, Brett Goldman compares the experience of performing a very basic rebase in the CLI vs GitKraken, followed by a demonstration of what happens, and what to do, when conflicts occur. Take a look and subscribe to our YouTube channel for more videos about learning Git with GitKraken.

Introducing Launchpad for GitKraken On-Premise: Start Your Day Informed
With GitKraken Desktop 10.8, we’re introducing Conflict Prevention, a new feature that helps you catch and resolve potential conflicts before they become a problem. By identifying conflicting changes early, you can avoid last-minute surprises and keep your development process running smoothly.