Programmer Humor

19589 readers

2179 users here now

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

founded 1 year ago

MODERATORS

[email protected]

1113

Rebase Supremacy (programming.dev)

submitted 7 months ago by [email protected] to c/[email protected]

238 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 5 points 7 months ago (1 children)

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

[–] [email protected] 3 points 7 months ago (1 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 (?)

[–] [email protected] 2 points 7 months ago (1 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.

[–] [email protected] -1 points 7 months ago* (last edited 7 months ago) (1 children)

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.

[–] [email protected] 2 points 7 months ago

I am not. Read the context mate.