Skip to content

Cannot merge without ff? #21

@cornelius-dol

Description

@cornelius-dol

Our company disallows the use of FF merge, but I can't see a way to do this in GitFourchette. I tried merging, and it popped up to tell me I could just FF, but there seemed to be no option to perform the merge regardless. Nor could I see an option in preferences to do this.

I had to jump out to the command line to do this. This will come up very frequently in our workflow.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions