9mo ago

Rebase Supremacy

You're viewing a single thread.

238 comments

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.
- That was you! I remember this.
  
  AAAH NOT LIKE THIS
  
  There's 102 people mentioned in that commit and two of them happen to meet in the comments of a meme thread on Lemmy of all places. I love the Internet.
- 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.
- Merge is not the issue here, rebase would do the same.
  
  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 (?)
  
  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.
  
  Just for the record, I think you're conflating git and GitHub. They are not the same thing, even if GH would like you to think so.
  
  I am not. Read the context mate.
- You sent over twenty-two thousand notifications lmao.
  And then the bot added about as many tags to the PR.

238 comments