Skip to content

Topic 05: Re-order the git rebase commands to run a rebase with a conflict first, rather than an interactive rebase #12

Open
@david-martin

Description

@david-martin

Running git rebase -i HEAD~4 doesn't follow on very well after the explanation of rebasing between branches.
It might be better to have a conflicted branch ready to rebase and run git rebase origin/master or similar to show the conflict and how to resolve it.

The interactive rebase where commits are modified could happen after that part

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions