search

microsoft / vscode

Visual Studio Code
https://code.visualstudio.com
MIT License
160.93k stars 28.23k forks source link

Add Git Squash Commits UI feature #214809

Open Spikhalskiy opened 1 month ago

Spikhalskiy commented 1 month ago

Add an ability to select any number of potentially non-consecutive commits in the Git branch and squash them into one commit with a place and date of the oldest selected commit. This flow should also allow to edit the description of the final squashed commit. This ability will allow using VS Code to reorganize and clean up git branch history without switching to competing IDEs that support this functionality.

It would be a great addition to the graph representation of the git history graph requested in #179053

Ninos commented 1 month ago

Would be awesome to see such feature in future releases, currently working with vscode in teams is horrible (lots of merge conflicts because some cannot easily squash & then rebase) ❤️