Merged

  • leds@feddit.dkOP
    link
    fedilink
    arrow-up
    0
    ·
    10 months ago

    But thanks for keeping my phone up to date, it is appreciated ♥

    • infinitevalence@discuss.online
      link
      fedilink
      English
      arrow-up
      0
      ·
      10 months ago

      Same, I run 3 devices all on Lineage and its great. Who know that you could still get updates and support for a device from 10 years ago, suck on that apple.

  • aMockTie@beehaw.org
    link
    fedilink
    arrow-up
    0
    ·
    10 months ago

    Why did they submit this as a pull request in the first place? Just commit it to a WIP branch until it’s ready to merge. Am I missing something?

    • NotSteve_@lemmy.ca
      link
      fedilink
      arrow-up
      0
      ·
      10 months ago

      I do this often. It’s useful if you want to send it to your coworker for some early feedback or as others have said, have the CI run

    • Dr. Jenkem@lemmy.blugatch.tube
      link
      fedilink
      English
      arrow-up
      0
      ·
      edit-2
      10 months ago

      It’s been a while since I’ve worked with AOSP, but I had always understood it to be some weird shit with Google’s internal processes. The “do not merge” commits are all over the AOSP, or at least they used to be.

      • leds@feddit.dkOP
        link
        fedilink
        arrow-up
        0
        ·
        10 months ago

        Does gerrit have a draft state? In azure devops you can mark PR as draft , won’t trigger any builds but you can still start them manually

    • xia@lemmy.sdf.org
      link
      fedilink
      English
      arrow-up
      0
      ·
      10 months ago

      Maybe they dont use squash merges, so all the intermediate commits remain on-chain?

  • cornshark@lemmy.world
    link
    fedilink
    arrow-up
    0
    ·
    10 months ago

    Heh, a funny collision of terms.

    The green Merged means that the pull request was submitted into the branch.

    The DO NOT MERGE text is an instruction for automerger. Android is developed in a truly startling amount of related git branches. Automerger is the tool that propagates commits back and forth to make sure pull requests get to all flavours, versions and devices.

    DO NOT MERGE tells Automerger not to propagate that pull request to newer versions of Android, i.e. it’s a fix for the currently released version that’s not relevant to the next development version of Android for whatever reason.

    Also seen, although more rarely, is DO NOT MERGE ANYWHERE which tells Automerger not to propagate the pull request to any other branch other than where it was originally submitted, including branches for related products on the same version of Android.

    • leds@feddit.dkOP
      link
      fedilink
      arrow-up
      0
      ·
      10 months ago

      Interesting, thanks for explaining. Like someone else was saying it is already in AOSP not introduced in lineage which makes sense since it is just a cherrypick