Up and Running with Git Transcripts
Chapter: Teamwork: Merging
Lecture: Staying *out* of the terminal
Login or
purchase this course
to watch this video and the rest of the course contents.
0:00
You probably don't want to end up in just the terminal or having your files get
0:07
little indentations and markers saying this version is in here and that versions there. Opening up an editor and just try to fix it.
0:15
That merge experience we had in PyCharm was fantastic. So you don't want to end up in the terminal or in some other crummy tool
0:23
trying to do this. How do you do that? Well, you could use PyCharm professional,
0:28
which would be awesome. I think actually the community edition also has that but if say you're using source tree, it wanted to use an external tool.
0:37
I believe it comes with one built in. That's okay. But there's also a couple of recommendations I'll make for you.
0:43
So there's a few commercial projects out there. There's something called beyond compare. And if you want to feel like the dream of
0:50
the 90s is still alive. Oh my goodness. You could fire up the software and It looks like it's from the 90s but it's
0:56
actually really, really useful and really effective. So I think this is pretty nice.
1:01
It costs them money. I can't remember what it's like $30 for a lifetime access It's, it's fine if you want to pay for anything at all.
1:09
Otherwise you could just search for some some merge tools. Three way you want, three way merge tools.
1:15
That's the important thing and you can set that up in something like source tree if you want to go ultra premium with the brushed aluminum.
1:25
Look, you can get kaleidoscope. This is only for Mac and it is a super premium type of thing. It'll diff images, I think it'll diff word documents.
1:35
It'll do all sorts of things. Honestly, I haven't used this yet,
1:38
but its whole purpose is like this premium merge experience in finding differences and it seems
1:44
pretty fantastic. But its price is also pretty fantastic. It's $150 for emerged tools. So you know,
1:51
I'm not there yet. I'm either using PyCharm generally or when I'm not using that. I'm absolutely using beyond compare beyond compare is fantastic.
1:59
If you have a whole directory tree of changes, you're like, I need to see how everything in this directory changed compared to that
2:05
and you can dive into the individual files and so on. Finally, if you're actually using the terminal for things like git,
2:13
git pulled, git pushed and so on on the terminal or command prompt, you might want to check out this article links at the bottom here you can go
2:22
and actually configure which diff tools are launched when you run cli commands that result in some kind of merge conflict. So for example,
2:32
you can set up a diff tool and emerge tool. It says pro only. This is not pro git and this is pro beyond compare
2:39
So in this example it's showing you how to set up beyond compare registered globally
2:45
for your user account with git so anytime git encounters one of these problems. Boom, this is going to pop up.
2:51
That's pretty cool. You just do get Config--global diff.tool bc3 and I guess you could not do the global and probably make it for
3:01
one project or the other. So when you're doing these merges again, almost all the time it's automatic,
3:07
but when it's not, you want a really good tool to help you. So go out and find one. Set it up. Like I said,
3:13
source tree, I think it has a nice one built in uh that it registers but you can find other ones, like the ones I've suggested here.