pull-requests: write
    runs-on: ubuntu-latest
    steps:
      - name: Check if PRs have merge conflicts
        uses: eps1lon/actions-label-merge-conflict@v3
        with:
          dirtyLabel: "conflicts"
          repoToken: "${{ secrets.GITHUB_TOKEN }}"

    /**
     * Ensures that all list-merge methods are overridden
     */
    @Test
    void testOverriddenMergeMethods() {
        List<String> methodNames = Stream.of(MavenMerger.class.getDeclaredMethods())
                .filter(m -> m.getName().startsWith("merge"))
                .filter(m -> {
                    String baseName = m.getName().substring(5 /* merge */);

        repositoryEventDispatcher.dispatch(event.build());
    }

    private void merge(
            Artifact artifact, Map<String, VersionInfo> infos, Versioning versioning, ArtifactRepository repository) {
        if (versioning.getRelease() != null && !versioning.getRelease().isEmpty()) {
            merge(RELEASE, infos, versioning.getLastUpdated(), versioning.getRelease(), repository);
        }

    init {
        id("Promotion_MergeReleaseIntoMaster")
        name = "Merge Release into Master"
        description = "Merge Release into Master"

        val vcsBranch = VersionedSettingsBranch.fromDslContext()

        steps {
            gradleWrapper {
                name = "Merge Release into Master"
                tasks =
                    listOf(

	}
}

func (rt *RTimedMetrics) merge(o RTimedMetrics) (n RTimedMetrics) {
	n.SinceUptime.Bytes = atomic.LoadInt64(&rt.SinceUptime.Bytes) + atomic.LoadInt64(&o.SinceUptime.Bytes)
	n.SinceUptime.Count = atomic.LoadInt64(&rt.SinceUptime.Count) + atomic.LoadInt64(&o.SinceUptime.Count)

	n.LastMinute = n.LastMinute.merge(rt.LastMinute)
	n.LastMinute = n.LastMinute.merge(o.LastMinute)
	n.LastHour = n.LastHour.merge(rt.LastHour)

     *
     * @return the filename
     */
    String getRemoteFilename();

    /**
     * Merge a new metadata set into this piece of metadata.
     * TODO this should only be needed on the repository metadata {@link org.apache.maven.artifact.metadata.ArtifactMetadata}
     *
     * @param metadata the new metadata
     */
    void merge(ArtifactMetadata metadata);

    /**
     * Store the metadata in the local repository.

    // When elements compare as equal (both C's have same letter), our merge should always return C1
    // before C2, since C1 is from the first iterator.

    Iterator<TestDatum> merged =
        Iterators.mergeSorted(ImmutableList.of(left.iterator(), right.iterator()), comparator);

    ImmutableList<TestDatum> result = ImmutableList.copyOf(merged);

    assertThat(result)
        .containsExactly(

# Always check-out / check-in files with LF line endings.
* text=auto eol=lf

hack/verify-flags/known-flags.txt merge=union
test/test_owners.csv merge=union

**/zz_generated.*.go linguist-generated=true
**/types.generated.go linguist-generated=true
**/generated.pb.go linguist-generated=true
**/generated.proto
**/types_swagger_doc_generated.go linguist-generated=true
api/openapi-spec/*.json linguist-generated=true

    }

    @Override
    public void merge(ArtifactMetadata metadata) {
        ProjectArtifactMetadata m = (ProjectArtifactMetadata) metadata;
        if (!m.file.equals(file)) {
            throw new IllegalStateException("Cannot add two different pieces of metadata for: " + getKey());
        }
    }

    @Override
    public void merge(org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata) {

        result.setLocations(locations);

        return result;
    } // -- InputLocation merge( InputLocation, InputLocation, boolean )

    /**
     * Method merge.
     *
     * @param target
     * @param indices
     * @param source
     * @return InputLocation
     */
    public static InputLocation merge(
            InputLocation target, InputLocation source, java.util.Collection<Integer> indices) {