Remove merge conflict label

[wolfgangwalther]

This label is now managed by Nixpkgs CI. Technically it doesn't hurt to manage it via ofborg, too, but ofborg is too quick sometimes. The scheduled labeler in nixpkgs CI works with a bit of delay and thus doesn't temporarily label a PR conflicted while changing base branches and pushing again.

As discussed in NixOS/nixpkgs#422906 (comment).

cc @philiptaron

[philiptaron]

Yep. I'm not familiar with the ofBorg branches: is released the correct target?

[wolfgangwalther]

I am not either, but it's the only branch (except two dependabot branches), so.. yes :)

[wolfgangwalther]

In 424162 ofborg and nixpkgs-ci are playing ping-pong with the merge conflict label. Clearly, ofborg has other ideas about the merge status than nixpkgs-ci and GitHub.

So we should really disable this.

@dasJ could you please look at this PR or alternatively onboard me in terms of how to merge and deploy stuff as mentioned in #695 (comment)?

[sternenseemann]

@wolfgangwalther ofborg is right in that case as there is no actual conflict, i.e. git can merge that branch automatically.

[wolfgangwalther]

Well, "being right" is not what we want to indicate, though. GitHub's UI doesn't allow merging, because it identifies a merge conflict. The label should reflect that, to be able to easily filter out PRs where you can't hit the button.

[Conni2461]

diff looks good to me, thanks. i cant merge here, i asked dasJ in private if he can merge, but i just deployed that change to production: NixOS/ofborg-infrastructure@1881981

[wolfgangwalther]

@Conni2461 is that deployment live already?

In NixOS/nixpkgs#424162, ofborg is still doing something about this label. Did I forget any related code? I don't think so.

[Conni2461]

you were right i havent deployed the right host the first time i deployed, but i fixed that right after you pinged me last week and i just checked the logs and ofborg didnt add another label for merge conflicts since then. so this is good to go.

thanks again :)