The Belfry
  • Communities
  • Create Post
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
JPDev@programming.dev to Programmer Humor@programming.dev · 2 years ago

Rebase Supremacy

programming.dev

message-square
8
link
fedilink
7

Rebase Supremacy

programming.dev

JPDev@programming.dev to Programmer Humor@programming.dev · 2 years ago
message-square
8
link
fedilink
alert-triangle
You must log in or # to comment.
  • JoYo@lemmy.ml
    link
    fedilink
    arrow-up
    0
    ·
    2 years ago

    Anyone mind explaining to me how git rebase is worth the effort?

    git merge has it’s own issues but I just don’t see any benefit to rebase over it.

    • Aux@lemmy.world
      link
      fedilink
      arrow-up
      0
      ·
      2 years ago

      Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?

      • jjjalljs@ttrpg.network
        link
        fedilink
        arrow-up
        0
        ·
        2 years ago

        Squash your branch first

        • rapist1@lemmy.world
          link
          fedilink
          arrow-up
          0
          arrow-down
          1
          ·
          2 years ago

          Doesn’t this defeat the purpose, may as well merge then no?

  • amniotic druid@lemmy.world
    link
    fedilink
    arrow-up
    0
    ·
    2 years ago

    Why is anyone using X in 2024?

  • sirleonelle@sh.itjust.works
    link
    fedilink
    arrow-up
    0
    ·
    2 years ago

    I’ll go one further: use git rebase --interactive

    • Nate Cox@programming.dev
      link
      fedilink
      English
      arrow-up
      1
      ·
      edit-2
      10 months ago

      deleted by creator

  • Margot Robbie@lemm.ee
    link
    fedilink
    arrow-up
    0
    ·
    2 years ago

    I think this is a fake quote that somebody made up for an Internet comedy bit, since it seems unlikely for Hollywood actress Sydney Sweeney to have such uncharacteristically strong opinion on software version control, of all things.

    Because she of all people would know that there isn’t anything wrong with using git merge, and it ultimately comes down to personal preference to what you are used to.

    • archomrade [he/him]@midwest.social
      link
      fedilink
      English
      arrow-up
      1
      ·
      2 years ago

      Fair point, Margot Robbie

Programmer Humor@programming.dev

programmer_humor@programming.dev

Subscribe from Remote Instance

Create a post
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programmer_humor@programming.dev

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics
Visibility: Public
globe

This community can be federated to other instances and be posted/commented in by their users.

  • 1.36K users / day
  • 3.09K users / week
  • 7.06K users / month
  • 12.3K users / 6 months
  • 1 local subscriber
  • 33.2K subscribers
  • 2.32K Posts
  • 57K Comments
  • Modlog
  • mods:
  • Feyter@programming.dev
  • adr1an@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.18
  • Modlog
  • Instances
  • Docs
  • Code
  • join-lemmy.org