Merged

all 32 comments

sorted by: hot top controversial new old
[–] 84 points 2 years ago (2 children)

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.

  • source
  • hideshow 4 child comments
  • [–] [S] 15 points 2 years 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

  • source
  • parent
  • [–] [S] 45 points 2 years ago (2 children)

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

  • source
  • hideshow 4 child comments
  • [–] 1 point 2 years 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.

  • source
  • parent
  • [–] 26 points 2 years ago (1 child)

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

  • source
  • hideshow 2 child comments
  • [–] 25 points 2 years ago (2 children)

    It's when you have more than 99 tabs open

  • source
  • parent
  • hideshow 4 child comments
  • [–] 11 points 2 years ago (3 children)

    What kind of psychopath has that many tabs open!?

  • source
  • parent
  • hideshow 6 child comments
  • [–] 19 points 2 years ago (2 children)

    I take personal offense to that. How do you not?

  • source
  • parent
  • hideshow 4 child comments
  • [–] 5 points 2 years ago (2 children)

    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.

  • source
  • parent
  • hideshow 4 child comments
  • [–] 1 point 2 years ago (1 child)

    Yeah it's a bit weird with FF, I just purge open tabs for unnecessary tabs daily.

  • source
  • parent
  • hideshow 2 child comments
  • [–] 1 point 2 years ago (2 children)

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

  • source
  • parent
  • hideshow 4 child comments
  • [–] 21 points 2 years ago (3 children)

    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?

  • source
  • hideshow 6 child comments
  • [–] 30 points 2 years ago (1 child)

    Probably to get some other benefitof the PR system, such as CI tests

  • source
  • parent
  • hideshow 2 child comments
  • [–] [S] 10 points 2 years ago (2 children)

    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

  • source
  • parent
  • hideshow 4 child comments
  • [–] 11 points 2 years ago (1 child)

    There are a LOT of these in lineage repos. There must be a reason

  • source
  • hideshow 2 child comments
  • [–] 9 points 2 years ago

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

  • source
  • [–] 4 points 2 years ago