Just started using git! This and your python videos are my favourite source of learning at the moment! Thank you for yet another great video, hope you're doing well!
In the 3-pane example at the end, it wasn't clear which pane was the local live branch (your file system), the repository stored content and/or the locally committed results (staged).
+Minok1217 DiffMerge doesn't have the option to enlarge the font, so it is difficult to see in the video, but if you run this on your machine then there is a label above each panel letting you know exactly which is which.
I installed it using .pkg as you suggested but there is no diffmerge file in /urs/bin/. I see only diff and diff3 files, no diffmerge. I see diffmerge only in /usr/local/bin/ Also, typing git difftool does not open difftool as in video but shows it in terminal just like diff command does. I have set up all as you and the link of Two Bit Labs suggested. But this is not working No answer to any questions people are asking here in comments?
Hi Corey, Need help. I could install and configure diff/merge tools but when I try to open the file with git difftool command it opens an empty window. It's not showing the opened files. Mine is windows 10 environment with 64bit
Ok, the Apple CPU and GPU are a bit more powerful and now the main thing. What is the ratio of price to performance? I will try to guess, the price of the laptop with Snapdragon will be much more favorable, so who is the winner? It depends on everyone how much they use Apple products and what software they are used to.
How to install it on Windows machine? I could do until git config --global difftool.diffmerge.cmd 'diffmerge "$LOCAL" "$REMOTE"' where it shows usage: git config []. There is no other source I may refer to.
I watched all your GIT videos and you really know how to teach. Thanks for good work and sharing.
Very Nicely Explained..! Simple explaination to give clarity..! You have organized the order of topics very systematically ! Kudos
SourceTree is one of the most popular now :) - 2019
Yep, I love SourceTree. I should make a follow-up video discussing it
It only took me 10hours approx. to find your channel. damn. Thank you very much
Just started using git! This and your python videos are my favourite source of learning at the moment! Thank you for yet another great video, hope you're doing well!
Thanks a lot.
there's also this tool called 'meld ' and it works perfectly and has nice gui
cool videos. easy to understand. best of git tuts out there. thank you
Thank you so much!
Thanks again for helping learn another new feature. Kudos!
Now we had everything and in a better way in VS code or Jetbrains
Another great video. Thanks for sharing
VS code solves all of these problems pretty well these days.
In the 3-pane example at the end, it wasn't clear which pane was the local live branch (your file system), the repository stored content and/or the locally committed results (staged).
+Minok1217 DiffMerge doesn't have the option to enlarge the font, so it is difficult to see in the video, but if you run this on your machine then there is a label above each panel letting you know exactly which is which.
In minute 7:23 starts the explanation
Great videos. Could you put something on tagging too?
Hey Sir!, thanks for this video...it helped a lot
thank you for explaining it in detail :-) Great video.
Very usefull video !!! Great ! Thanks.
meld is a good alternative to diffmerge. meld is also open source
It is not possible to install it on macos catalina I guess
I use kdiff often, anyway this is a new way to do diffing.
I installed it using .pkg as you suggested but there is no diffmerge file in /urs/bin/. I see only diff and diff3 files, no diffmerge. I see diffmerge only in /usr/local/bin/
Also, typing git difftool does not open difftool as in video but shows it in terminal just like diff command does. I have set up all as you and the link of Two Bit Labs suggested. But this is not working
No answer to any questions people are asking here in comments?
Help:
When i solve a merge conflict a *.orig file is created automatically. How can disable this behaviour within the DiffMerge tool?
Hi Corey, Need help. I could install and configure diff/merge tools but when I try to open the file with git difftool command it opens an empty window. It's not showing the opened files. Mine is windows 10 environment with 64bit
thnk u so much..
I see you're an Anki user!!!!!!!!!!!!!!!!!!!!!!!!!!!
Thank you
you can do the same with vscode. much easier
are you switching to sublimeMerge?
Ok, the Apple CPU and GPU are a bit more powerful and now the main thing. What is the ratio of price to performance? I will try to guess, the price of the laptop with Snapdragon will be much more favorable, so who is the winner? It depends on everyone how much they use Apple products and what software they are used to.
How to install it on Windows machine? I could do until git config --global difftool.diffmerge.cmd 'diffmerge "$LOCAL" "$REMOTE"' where it shows usage: git config []. There is no other source I may refer to.
With the git config statements.. is this globally or something I will need to do in each repo?
+Nick turnitin Those should be global
What does the green red blue color coding mean?
Good vedio Thanks
I cannot use this on my ubuntu machine... Please help !
Doesnt work on macOS Catalina as of today.
brew cask install diffmerge (type this is terminal to download diffmerge in mac)
It should be "/usr/local/bin/diffmerge" :)
Same on my Mac but regardless, not working
DiffMerge is Paid or opensource software?
He mentioned in the video it was free.
paid, need to register to get full feature set, $19
I tried to mac my diff and the git didnt work
Thank you, but you got bogged down in all the faults with Mac OS rather than the product.
1.25 is your normal speed