• 0 Posts
  • 42 Comments
Joined 1 year ago
cake
Cake day: January 3rd, 2024

help-circle
  • is there a way to move commit out of the way Todo later?

    This is what cherry-pick does for me. Now that the work is all done, I can cherry-pick the commits into the new branch in any order I find convenient (and often in an order that causes fewer git conflicts, or no git conflicts to resolve.)

    Note that this approach is much stronger if the original commits are fairly focused and purposeful.

    In extreme cases, I stop and rebase the new or old branch to clean up the commits before I cherry-pick them onto the same branch.

    In essence, all of these techniques are just ways for me to very slowly and methodically organize thoughts, using git.

    Also, sometimes it’s all too messy and I just copy and paste all the change I need into a fresh clean branch.