1106

submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev

229 comments fedilink hide all child comments

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

[-] tengkuizdihar@programming.dev 43 points 7 months ago

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.

[-] Atemu@lemmy.ml 5 points 7 months ago

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

[-] tengkuizdihar@programming.dev 3 points 7 months ago

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 (?)

[-] Atemu@lemmy.ml 2 points 7 months ago

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.