Setting to allow fast-forward merge feature into develop

[Ovsyanka]

trafficstars

Hello!

As I see when I finishing a feature it always merge into the develop with --no-ff flag. But sometimes it is not needed. You can see different opinions on that matter here: https://github.com/nvie/gitflow/issues/100

So, my suggestion is to add the configurations setting with choises:

• use always --no-ff
• use --no-ff only when there is more then one commit
• not use --no-ff at all (I am not sure about this one thought)

upd: the issue solved in this fork, marketplace link, look at this comment for the details.

[anhthang]

I think your suggestion is included in this release (2.1.0) here https://marketplace.visualstudio.com/items?itemName=buianhthang.gitflow

• always use --no-ff by default
• if only one commit in the feature, do fast forward merge with the option --ff
• if the user want to squash during merge (a new config squashFeatureDuringMerge), use --squash instead

give it a try and let me know if you have any comments

[Ovsyanka]

@anhthang In my expirience it still use --no--ff for the feature branches even with one exact commit.

I made a little search and found this part of code. https://github.com/vector-of-bool/vscode-gitflow/blob/863324574a3ca1e201e570ccc3bcc31ff8f89afb/src/flow.ts#L319

Looks like there is --no-ff hardcoded.

[anhthang]

@Ovsyanka Ah, I forgot to mention that I forked and published new version with some updates, fixes. You can try the link I shared

[Ovsyanka]

@anhthang Sorry I did mess up indeed. Thank you for pointing to your fork!

As I can see the merging there works as you described and it fulfill my needs.