Add setting for PR-style squash for feature and release branches

vector-of-bool / vscode-gitflow

Gitflow integration for Visual Studio Code

89 stars 22 forks source link

Add setting for PR-style squash for feature and release branches #30

Open JustinGrote opened 6 years ago

JustinGrote commented 6 years ago

Hello,

Love the extension but currently having to squash feature branches before merging. A toggle setting in User Settings that would just add -S to the "finish" command would be great.

Proposed setting name: gitflow.squashBranchOnFinish

sebastianmacias commented 5 years ago

I'm currently needing to squash commits before merging as well. Are there any plans to implement this?

anhthang commented 4 years ago

@JustinGrote @sebastianmacias do you guys still need this feature? what's your prefer/expectation on the merge action:

checkout develop branch, merge the feature branch with --squash (git merge --squash feature/name)
rebase the feature branch first with the command like: git rebase -i HEAD~3, then checkout the develop branch and merge with the default option

JustinGrote commented 4 years ago

I now use GitDoc + Github Issues and Requests which meets this need for me, and most repositories I work with now have master gated with branch policies so git flow doesn't work as well for me anymore since I can't commit directly to master.

https://marketplace.visualstudio.com/items?itemName=vsls-contrib.gitdoc#collapsing-versions

To implement here, I'd recommend it be a git merge --squash --edit so that it pops up a vscode window that I can then edit the collapsed commit before closing and saving.

anhthang commented 4 years ago

glad to hear that you can resolve your issues and continue the works. your recommendation is my idea also. I have published a new version here with a setting to squash features during merge.

https://marketplace.visualstudio.com/items?itemName=buianhthang.gitflow

try it and give me comment if you have time