Setting to allow fast-forward merge feature into develop
Opened this issue · 4 comments
Ovsyanka commented
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: nvie/gitflow#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 commented
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 commented