GitLab GDK and Gitpod walkthroughs, 16 Sep 2021

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Editing commits with git rebase in Gitpod

Description

Nadia Sotnikova, the Product Designer at Verify (Pipeline Authoring) walks through her process for editing commits using interactive rebase in Gitpod.

A

Hey everyone: this is nadia the product designer at verified, pipeline authoring and today I'm working on an mmr to add some new documentation to the pajamas design system, and I have a failing job here. That's called danger review and if we go to the job logs.

A

We will see that the job is failing, because the commit does not comply with conventional commit specifications. So you can check out what the specifications are by going to this link right here. It's provided to you in the logs, but essentially what it means is that um your commits don't follow the guidelines or like the necessary format, so they should be in this format, and I just used the the commit name given to me by default and just made the commit, so we need to edit this commit in order for the job to pass.

A

So to do that, I will need to uh open up um the git pod. Well, you don't have to do it in git body. You can do it using your local terminal as well, but it's very easy to do to get parts, so I will just open github, I'm already running it, but here so this is pretty much what it will look like once it gets started. You have your instance running here. We can see we can preview the changes uh and whatnot, but for now all I'm concerned with is just editing the commits.

A

So, let's expand this just to make it easier to see so we're going to use gettrybase to edit the commits what it does is uh it's going to bring up this interactive rebase window that you can use to edit your commands to squash them together or kind of like combine the commits in one um yeah.

A

So it's a pretty handy tool if you need to if you you've, messed up something with your commits and you have to edit them so here this and you need to replace it with the number of commits you have in order for all of those commits to show up in the window. So I see that I have 13 comments here by the way, I'm not 100 sure I'm using correctly.

A

So if you know a better way, please do let me know but uh yeah, let's just say 13 and let's go back to 13, commits in the past.

A

uh All right, so it will open up this window where you can see all of the commits that you've made and there's also instructions here, which is super helpful, so like when you see it for the first time it can be a bit overwhelming, but just read these instructions and it kind of tells you what you need to do so you can reorder.

A

So each line is a commit on your branch and you can reorder these commits. For example, you can remove the commits, which means that the commit will be lost and all the changes that um they're associated with the commit uh there can be lost. So I just need to rename the commit just to make sure it follows the right structure. So I'm going to use the reward feature, so we need to replace the peak action to reward for the commit that we want to reward. So I'm gonna do that.

A

Let's reward this commit and I think I'm supposed to edit it right away. um So it's going to be feature.

A

And yeah that commit name okay, so that should work.

A

I may have just messed it up and removed the commit fashion, so I think it's supposed to be here. So, oh, let's go actually copy it and add that back in.

A

No, I don't need the whole thing.

A

Okay yeah now that should work, so uh we just need to save it and close the window, and it's supposed to run the rebase. Then.

A

Yeah, so the rebase has happened and um yeah, so it prompts me to update the name again. I'm not sure why to be honest, but let's do that.

A

Okay, so dewey base should be successful now and let's go and see.

A

Oh, of course, not because I have to push okay, so when you're doing the rebase, um you will have to force push your changes. Actually, I'm not sure what is the what's the command for that.

A

A

This is a disaster you could push forth. Okay, let's just do that and see if that works.

A

I believe now it's gonna work.

A

So the pipeline is running.

A

Let me just pause the video for a bit and I'm back with updated commit name, so that was successful. So, um okay, just to recap the steps that you need to take um in order to edit the commit.

A

If you want to use git body, you go to git, pod or just open up whatever terminal that you're using um run the rebase command so get rebase, and you need to specify how many commits back you want to go, which will open up a window where you can edit the commits, and you can apply different actions to those commits reorder them and whatnot.

A

And then once you close that with closet window, then the changes are applied and then you need to push those changes and after a git rebase, you will have to force push them in order for them to to get to your branch. So yeah. If you know a better way to do this, please let me know- and hopefully it will help you some stressful moments when you forget to write the commit the right way.

A