Effective PyCharm (2021 edition) Transcripts
Chapter: Source control
Lecture: Merging back with a pull request
0:00 So we made our fix to this version to header,
0:03 issue 48 branch but it's not actually in our podcast code.
0:08 What we want to do is we want to actually create what's called a poor request
0:11 Now this is not the way you have to do it.
0:13 You can go over in PyCharm and I could go this branch and just say
0:20 merge the changes we made into this branch and there would be a unrelated copy of
0:26 it dropped over here. Right.
0:28 But what we can do is we can put a little bit more formality around it
0:31 on github and this is super common,
0:33 which is why I show an issue over here is we might create a poor request
0:37 somebody wants to review it or have a record for this reason all of these
0:41 changes were brought over into this branch.
0:44 I'm gonna go ahead and you know,
0:45 github is really friendly and it says,
0:47 look here's some branches that are not the one you're on and you might want to
0:51 create a poor request. I'm going to switch the one I'm actually working on at
0:54 the moment and do the same,
0:56 then I'll click this button here.
1:00 If we look at it, it says we're going to take those changes we did
1:03 to that branch and I actually want to put it into this particular branch and it
1:06 says great, you can merge those changes automatically.
1:11 This will be super. And now we're going to fix say this fix uh fix
1:19 says issue 48 with this PR so we can open the poor request,
1:25 wait a moment. Then here we have the various changes we've done with our check
1:29 in and it's going to fix this now.
1:35 It's not yet merged it right.
1:37 It's created the poor request and we could assign someone to review it to make sure
1:40 everything works. If we had continuous integration setup,
1:42 it might run our tests to make sure if this change were brought in,
1:46 it's not going to break things and so on.
1:48 So what we would do is we push this button to merge those changes over what
1:54 we want to do one other thing before we push these changes in here.
1:57 So I'm actually not going to push it now.
1:59 I want to go back to PyCharm and play with this PR.
2:01 A little bit as well.