• Skip to primary navigation
  • Skip to main content
Sal Ferrarello
  • About Sal Ferrarello
  • Speaking
  • Connect
    Mastodon GitHub Twitter (inactive)
You are here: Home / Archives for rebase

rebase

Resolving Git Rebase Merge Conflicts

Last updated on February 2, 2021 by Sal Ferrarello

When performing a Git rebase, I often find myself in the situation where I have one or more merge conflicts. This is how I resolve these merge conflicts.

Warning! This is a draft, not a finalized post. See full draft disclosure.

Filed Under: Dev Tips, Draft, Solution Tagged With: Git, Merge Conflict, rebase

Building blocks representing two Git branches with the commit on one branch removed as happens in a rebase.

Git Rebase with Blocks

Last updated on March 4, 2021 by Sal Ferrarello

We can’t do a fast-forward merge when the most recent commit on the receiving branch does not appear in the branch we are merging in. One of our options in this situation is to rebase the branch we want to merge in.

Filed Under: Dev Tips, Programming Tagged With: Git, rebase

Boy looking through binoculars.

View Current Commit Message during Git Rebase Conflict

Last updated on January 17, 2021 by Sal Ferrarello

When I do a git rebase and I get a conflict, I can use git log to see all the commits rebased thus far. However, I often get confused about what the current (incomplete) commit is that caused the conflict. It would be super helpful if I could see the commit message of the current commit. This command allows you to view the current (incomplete) commit during a rebase.

Filed Under: Dev Tips, Solution Tagged With: Git, rebase

Screenshot of Git Log and Git Rebase Interactive showing in one case the newest commit is at the top and in the other case the newest commit is at the bottom.

Git Interactive Rebase Order is Wrong

Last updated on January 14, 2019 by Sal Ferrarello

The interactive rebase feature of Git is one of my favorites. I love being able to squash multiple commits into one commit or re-order my commits for clarity. My one complaint is the Git interactive rebase commit order is wrong (at least for the way my brain works).

Filed Under: Computing, Dev Tips, Recommendations, Solution Tagged With: Git, rebase

Copyright © 2023 · Bootstrap4 Genesis on Genesis Framework · WordPress · Log in