1120
Rebase Supremacy (programming.dev)
submitted 2 years ago by to c/programmer_humor@programming.dev
235 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 44 points 2 years ago (10 children)

Please for the love of god don't use merge, especially in a crowded repository. Don't be me and suffer the consequences. I mistakenly mention every person with a commit between the time I created the branch until current master.

  • permalink
  • fedilink
  • source
  • hideshow 10 child comments
    •
  • [–] 21 points 2 years ago (2 children)

    That was you! I remember this.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 11 points 2 years ago

    Could have been worse. I mean, like, imagine of you were using like CVS and you put a watch on the root! Haha and then like every trivial commit in the repo caused everyone to in the entire org to get an email and it crashed the email servers.

    Like who'd even DO that?! Though, I bet if you met that guy he'd be ok. Like not a jerk, and pretty sorry for all those emails. A cool guy.

  • permalink
  • fedilink
  • source
  • parent
  • [–] 5 points 2 years ago (4 children)

    Merge is not the issue here, rebase would do the same.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 3 points 2 years ago (3 children)

    really? how come? I thought they are mentioned because of the diffs if compared to master, which merge basically just... merge on top of my branch (?)

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •
  • [–] 2 points 2 years ago (2 children)

    They were mentioned because a file they are the code owner of was modified in the PR.

    The modifications came from another branch which you accidentally(?) merged into yours. The problem is that those commits weren't in master yet, so GH considers them to be part of the changeset of your branch. If they were in master already, GH would only consider the merge commit itself part of the change set and it does not contain any changes itself (unless you resolved a conflict).

    If you had rebased atop of the other branch, you would have still had the commits of the other branch in your changeset; it'd be as if you tried to merge the other branch into master + your changes.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •