Resolving 'git merge' or 'git rebase' conflicts with IntelliJ

Git Workflows‚óŹ7 Min. 15 Sec.

One of Intellij's killer features is resolving Git conflicts with the 3-way merge window. In this episode you'll learn how to feel confident about resolving conflicts whenever you do a git merge or git rebase and what IntelliJ offers you to help resolve these conflicts.

You need to login or buy this course in order to use watchlist, email functionality or track progress.

This lesson is not available in preview.

You need to buy this course to watch it. You can always try the free preview episode, too.

Buy This Course or Free Preview