Skip to content

git rebase --preserve-merges has been removed, git rebase --rebase-merges can cause major issues #5

Description

@joelmdev

Will add details. This issue is something I've been in contact with the git team about on and off over the last couple of years. Under certain circumstances --rebase-merges will completely hose the graph and changes have to be manually cherry picked to get the desired result instead.

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