3 posts tagged
Stop a conflicting git rebase, rewrite the unmerged file, git add, then GIT_EDITOR=true git rebase --continue. Prove a linear graph. Never vim or --force.
Squash unpublished feature commits with git rebase -i and GIT_SEQUENCE_EDITOR. Prove a shorter linear log. Never vim, never --force on a shared branch.
Rebase unpublished feature onto diverged main in a private scratch repo, then prove a linear graph and that HEAD^2 fails. Never -i or --force.