Getting started with Git using SourceTree - Part 4: Solving conflicts

This video series teaches you Git version control without having to use the command line. As an interface, we use SourceTree from Atlassian and KDiff3 by Joachim Eibl.

Part 4 covers changes made by different people to the same regions in a file: conflicts, and how to solve them.

(We are not affiliated with Atlassian or Joachim Eibl in any way.)

[bibbisbibbis]

This is so great!
You explain everything very clearly :)

[PatrikSound]

This is incredibly well presented, thank you for making this.
I'm a complete amatuer when it comes to Git, so finding this tutorial has been a godsend.

[dmitriydashchenko]

Thank you very much! I got started with Git and Source Tree in no time.

[Mixthelightintogray]

Great video and explanation, very clear and concise. I'm new with KDiff and your video has been very helpful, thanks a lot!
Have a good day! :D

[sharadshrestha]

good to watch such video.. very helpful

[orkuntoraman]

Very well explained indeed. Thank you sir.

[renankvieira]

Excellent video! If you did more on this level (everything is really great), you definitely would have your place in the tutorials echosystem. Also thanks. :)

[satyarathore]

thanks alot you explained it very beautifully...

[dontysk]

Hi, thanks for your videos, the explanations are very good. In the other hand, KDiff3 in Mac is very different, I cannot find the same options. For example I only can see A and B but not A, B and C. Thanks

[jeanatalle]

Great vid! Very straightforward. Can you use KDiff3 with macOS though? And what if there are more than 2 authors that committed some changes to the same line of the same file? Will KDiff still show the difference ALL the authors made? Thanks!

[phillipcarnock]

How do you know when to pull? Or rather, how can you tell if someone has pushed new lines. If Anne pushes changes, will Ben see a notification beside the Pull icon a few moments later? Great vid.

[Tsurugi]

Saved me and my team a lot of trouble, we may actually graduate then :P

[DrBreezeAir]

Thanks a lot! Very helpful for a noob like me.

[FarryEntertainment]

Why does SourceTree not just put "Ben was here!" underneath "Anne was here..." ?
Just add what has been pushed later undearneath the other code.

[mohammedamine]

git on Linux on terminal using commands ? is there any useful tutorial ?