• Atemu
    link
    fedilink
    58 months ago

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

    • @tengkuizdihar@programming.dev
      link
      fedilink
      37 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
        link
        fedilink
        27 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.

        • @Bourff@lemmy.world
          link
          fedilink
          1
          edit-2
          7 months ago

          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.