Skip to content

No fast forward option doesn't work in case of one commit bugfix merge #43

@pajakpawel

Description

@pajakpawel

Hey,

recently I have encountered a problem while merging a bugfix branch with just one commit. I had the option "--no-ff" checked in Bugfix section in IDE GitFlow plugin settings. I found a similar issue in the original repo regarding merging one commit features:

OpherV/gitflow4idea#225

I looked up what fixed the problem in the original repo for features: OpherV/gitflow4idea@c9c1b73

Image

It seems that the src/main/java/gitflow/GitflowImpl.java file, misses similar line of code for bugfixes:

Image

It is just a quick research so i moght be wrong but it seems right :)

If you need any other information just let me know!

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions