Effective PyCharm 2025 Transcripts
Chapter: Source Control
Lecture: Merging Branches in PyCharm
Login or
purchase this course
to watch this video and the rest of the course contents.
0:00
Let's talk about branch operations real quick in a little bit more depth. Basically, merging and comparing and so on.
0:08
This actually took me a little bit when I first started with PyCharm to figure out where it was.
0:14
So let's suppose here that I have the main branch checked out, which you can see from this top little drop-down name.
0:23
And I've already done some work in both PT and HTML extensions. These are the extensions that are common for chameleon template types.
0:34
If I want to take the changes from both PT and then merge it into my local working copy, I go to the recent branch, I find the branch in the drop-down,
0:44
wherever it happens to be, and then I expand it out and I say merge that branch into my active branch. So here's how you do merges in PyCharm.
0:54
You open up the branch you want to merge into, then you go find the one you want to merge from,
1:00
and you choose merge that thing into your current working branch. Then those merges come in as pending changes or potentially unpushed changes,
1:11
but they could be applied to your system. It depends on if there's any conflicts or things like that.
1:18
So then you go to this little section up here where it's the line with the circle in it, and you can see all the changes that have resulted here,
1:26
or you can hit the push, command shift K or control shift K, and it'll pull up the push dialog or even just do it here.
1:35
And it'll show you all the changes that have been merged in that will then be pushed up to the remote whenever you push them to the origin.
1:43
That's how you do merging in PyCharm.