Git Rebase & Squash in VS Code using GitLens Supercharge

Рет қаралды 60,873

Күн бұрын

aka.ms/vscode-git | Use Visual Studio Code for Rebase & Squash with GitLens Supercharge.
Host: @ReynaldAdolphe
0:00 Intro
0:28 Setup GitLens
0:50 Rebase explained
1:45 Setup branches for rebasing
2:20 Rebase demo
3:45 GitLens interactive editor for rebase
5:25 Squash explained
5:50 Squash demo
7:00 GitLens interactive editor for squash
6:50 Rebase to main
9:35 Summary
#git #github #vscode #visualstudiocode #squash #rebase

Пікірлер: 22

@MegaMatt3 5 ай бұрын

Sucks that simple things like a commit graph are "Pro" features in GitLens and are paywalled. I develop in an offline environment without the ability to "Sign in" to register extensions, so I'm stuck with the free version of GitLens. Also, my rebase had conflicts that needed to be resolved, and this video didn't cover that. I feel like I just need to go back to Webstorm where all this is built in.

@BehindTheYellowTapeAF Жыл бұрын

Thank you so much for your work, vscode is the best editor I have ever worked with, I love it

@RenanFranca Жыл бұрын

Thanks! When I discovered it my life with git became easier! You explain well! I just add git push --force if the branch is already pushed before.

@nro337 Жыл бұрын

This was really helpfu! Thank you!

@mageprometheus Жыл бұрын

Thanks. The plugin looks interesting.

@CalvaTV Жыл бұрын

Thanks! Very informative video, and cool to see your workflow. I love GitLens. If you do more source control videos, I’d like to see how to get out of messy situations. Three way merge. Figuring out what’s really the difference between origin and my branch. Why can’t I merge this with fast forward? What if I want to continue working on a new PR, based on the work from an unmerged one? Things like that.

@sunilchandran4u Жыл бұрын

Very informative. But to be honest, I dont want to run even a single command (like git rebase -i main in this video) in the terminal. Whats the purpose of these beautiful plugins then ? In intellij squash commit option available out of the box without any plugins. Need a similar feature in VS code (out of the box or via a plugin). Please let the viewers know if such a plugin available for VS code. Thank you

@user-sm6py1qv5d 9 ай бұрын

Don't rebase a public branch! *proceeds to rebase main*

@RiskGamer-de5js Ай бұрын

Superb bro & How to maintain the branches like dev QA staging prod branching strategy can you make a video on this & with git work flow.

@josersleal Жыл бұрын

crab "now looks a lot cleaner" did nothing

@user-gs3bb7px1t 10 ай бұрын

But how does it work if we have rebase conflicts?

@Redracer228 7 ай бұрын

Hi. Is squash feature free or when my free trial ends I cannot use this super cool interactive squash? 😢

@amygalles8110 3 ай бұрын

I tried to use this with vscode and the interactive rebase editor wasn't there

@haifzhan Жыл бұрын

I’m not able to access the feature, it shows GitLens+ is required 😂

@korigamik Жыл бұрын

Lmao I wouldn’t ever use this then

@harshsinha1460 Жыл бұрын

Can anyone help me in vscode?

@rutgerpronk2754 8 ай бұрын

Has anyone ever told you you look like the second iron man?

@harrythebossgamer7280 Жыл бұрын

Can you make VS games for PS5?

@RodrigoSilveira-vg3ip 3 ай бұрын

My VSC has options for: i) Create Merge Commit, ii) Squash and Merge, iii) Rebase and Merge. None are discussed in your video (sad face)

@quetzalcoatl-pl Ай бұрын

`git rebase -i New_Feature` on `main` to update the main ref to the tip? geesh, people. Of course you can use the forklift to open the elevator doors for you, but you know, there's a button for that. if you want to teach people the tools, at least do it right. Pretty please.