Merged

  • @[email protected]
    link
    fedilink
    846 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.

    • @[email protected]OP
      link
      fedilink
      156 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

    • @[email protected]
      link
      fedilink
      16 months ago

      Out of curiosity, any idea what automerger they use? I have always been on the lookout for one for hobby projects.

    • @[email protected]
      link
      fedilink
      English
      146 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.

    • @[email protected]
      link
      fedilink
      1
      edit-2
      6 months ago

      It’s just kind of sucks that updates consistently breaks banking apps and other stuff relying of passing safetynet. Every time I update I have to do the Magisk workaround again which is really annoying.

  • sneaky hecker
    link
    fedilink
    266 months ago

    Even if it was merged I’d be more concerned how on earth you have infinite Firefox tabs open

          • @[email protected]
            link
            fedilink
            2
            edit-2
            6 months ago

            I bookmark stuff I need at a later time, or will need again, and read the stuff I want to read now and close the tab when I’m done.

          • @[email protected]
            link
            fedilink
            16 months ago

            I close all the tabs regularly. Bookmark for those that I need to save for longer than one session

        • Poplar?
          link
          fedilink
          14
          edit-2
          6 months ago

          I keep tabs open as a sort of “read page later” list. I never seem to get to reading them though.

          • @[email protected]
            link
            fedilink
            16 months ago

            So do I, for a few days. If I haven’t read it by then, I’ll either bookmark for later or just close. I pretty much never have more than 10-15 active tabs ever.

        • Daeraxa
          link
          fedilink
          56 months ago

          I got to that once, on mobile I’ve never worked out the rule for when FF opens a new tab vs opening a site in your current tab. They just kind of silently accumulate.

            • @loutr
              link
              16 months ago

              There’s a setting to auto-close tabs after a certain amount of time.

          • @[email protected]OP
            link
            fedilink
            16 months ago

            Yeah that’s the problem I have, started while ago. It opens a new tab instead switching to existing tab.

  • UnfortunateShort
    link
    fedilink
    96 months ago

    That’s why there are draft merge requests nowadays. Although I kinda miss the “DONT MERGE WE GONNA DIE” comments.