Comment on History repeats itself

• yogo@lemm.ee ⁨1⁩ ⁨year⁩ ago

  That’s called rebasing

  source

  • atyaz@reddthat.com ⁨1⁩ ⁨year⁩ ago

    That is absolutely not what rebasing does. Rebasing rewrites the commit history, cherry picking commits then doing a normal merge does not rewrite any history.

    source

    • yogo@lemm.ee ⁨1⁩ ⁨year⁩ ago

      I’m sorry but that’s incorrect. “Rewriting the commit history” is not possible in git, since commits are immutable. What rebase actually does is apply each commit between upstream and head on top of upstream, and then reset the current branch to the last commit applied (This is by default, assuming no interactive rebase and other advanced uses). But don’t take my word for it, just read the manual. git-scm.com/docs/git-rebase

      source

      • atyaz@reddthat.com ⁨1⁩ ⁨year⁩ ago

        “Reapply” is rewriting it on the other branch. The branch you are rebasing to now has a one or multiple commits that do not represent real history. Only the very last commit on the branch is actually what the user rebasing has on their computer.

        source

        • -> View More Comments
  • fiah@discuss.tchncs.de ⁨1⁩ ⁨year⁩ ago

    for some reason it’s easier though

    source

    • yogo@lemm.ee ⁨1⁩ ⁨year⁩ ago

      Have you tried interactive rebase (rebase -i)? I find it very useful

      source

      • Blamemeta@lemm.ee ⁨1⁩ ⁨year⁩ ago

        Yeah, but then you deal with merge conflicts

        source

        • -> View More Comments
• BabaYaga@reddthat.com ⁨1⁩ ⁨year⁩ ago

  I’ve definitely done this before…

  source
• GigglyBobble@kbin.social ⁨1⁩ ⁨year⁩ ago

  If your cherry-pick doesn't run into conflicts why would your merge? You don't need to merge to master until you're done but you should merge from master to your feature branch regularly to keep it updated.

  source

  • Blamemeta@lemm.ee ⁨1⁩ ⁨year⁩ ago

    Git is weird sometimes.

    source
• JDubbleu@programming.dev ⁨1⁩ ⁨year⁩ ago

  This is actually genius. Gonna start using this at work.

  source