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.
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. :)
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
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!
You will only ever merge one version with another version. If commits were made by three different people, you'd resolve them one at a time. And yes, KDiff3 is available on macOS. But I'm going to cover different free merge tools in a new video soon!
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.
In general, you pull before you go push; It depends on the workflow of the team. I often Fetch after committing. There's an option in General preferences: Refresh remote status every X minutes, that will do a Fetch so Sourcetree can show any new commits on the remote.
There are some of those, the reason I started making these was that Getting started with Git videos existed using command line, but not using Sourcetree.
If you are writing code together, there is no way for Git to know what the different order of lines will end up doing. Sometimes it can work the way you suggested, but sometimes the first added line will have to be the last line of code, and sometimes something entirely different will have to be done to make sure both additions work.
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.
This is so great!
You explain everything very clearly :)
Thank you very much! I got started with Git and Source Tree in no time.
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
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. :)
this man is a hero. THANK YOU!
Excellent explanation.... too good
good to watch such video.. very helpful
Very well explained indeed. Thank you sir.
Great job!!! It's very helpful.
Very helpful, thank you.
Thanks that was really helpful 👍
thanks alot you explained it very beautifully...
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
I will soon be making a new version of this video, also showing two other tools than KDiff, P4Merge and Sublime Merge (at least).
Saved me and my team a lot of trouble, we may actually graduate then :P
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!
You will only ever merge one version with another version. If commits were made by three different people, you'd resolve them one at a time. And yes, KDiff3 is available on macOS. But I'm going to cover different free merge tools in a new video soon!
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.
In general, you pull before you go push; It depends on the workflow of the team. I often Fetch after committing. There's an option in General preferences: Refresh remote status every X minutes, that will do a Fetch so Sourcetree can show any new commits on the remote.
Thank you
git on Linux on terminal using commands ? is there any useful tutorial ?
There are some of those, the reason I started making these was that Getting started with Git videos existed using command line, but not using Sourcetree.
Why does SourceTree not just put "Ben was here!" underneath "Anne was here..." ?
Just add what has been pushed later undearneath the other code.
If you are writing code together, there is no way for Git to know what the different order of lines will end up doing. Sometimes it can work the way you suggested, but sometimes the first added line will have to be the last line of code, and sometimes something entirely different will have to be done to make sure both additions work.
Thanks very much
Thanks a lot! Very helpful for a noob like me.
Thx!!
And what about binary files?
hi's guys