From 66619961d3da0744f63d2986d3b3e628c18d7e88 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Mar 2026 17:14:10 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Prepare=20release=204.6.0=20=E2=80=94=20fix?= =?UTF-8?q?=20merge=20conflict,=20bump=20version.props=204.5.0=20=E2=86=92?= =?UTF-8?q?=204.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix merge conflict in RELEASE_NOTES.md (4.6.0 section had unresolved conflict markers from concurrent PRs #261 and #264 merging into main) - Bump version.props from 4.5.0 to 4.6.0 to cover all unreleased additions merged since the 4.5.0 version bump: - PR #261: findIndex, tryFindIndex, findIndexAsync, tryFindIndexAsync, sortWith - PR #264: isEmpty, tryHead, except All 287 tests pass. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- RELEASE_NOTES.md | 3 --- version.props | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f2d7f4b..5b078ca 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,16 +1,13 @@ ### 4.6.0 -<<<<<<< repo-assist/improve-isempty-tryhead-except-2471744-646c6897389cdfcb * Added `AsyncSeq.isEmpty` — returns `true` if the sequence contains no elements; short-circuits after the first element, mirroring `Seq.isEmpty`. * Added `AsyncSeq.tryHead` — returns the first element as `option`, or `None` if the sequence is empty, mirroring `Seq.tryHead` (equivalent to the existing `AsyncSeq.tryFirst`). * Added `AsyncSeq.except` — returns a new sequence excluding all elements present in a given collection, mirroring `Seq.except`. -======= * Added `AsyncSeq.findIndex` — returns the index of the first element satisfying a predicate; raises `KeyNotFoundException` if no match, mirroring `Seq.findIndex`. * Added `AsyncSeq.tryFindIndex` — returns the index of the first element satisfying a predicate as `option`, or `None` if not found, mirroring `Seq.tryFindIndex`. * Added `AsyncSeq.findIndexAsync` — async-predicate variant of `AsyncSeq.findIndex`; raises `KeyNotFoundException` if no match. * Added `AsyncSeq.tryFindIndexAsync` — async-predicate variant of `AsyncSeq.tryFindIndex`; returns `option`. * Added `AsyncSeq.sortWith` — sorts the sequence using a custom comparison function, returning an array, mirroring `Seq.sortWith`. ->>>>>>> main ### 4.5.0 diff --git a/version.props b/version.props index 1c21cec..3dedc1d 100644 --- a/version.props +++ b/version.props @@ -1,5 +1,5 @@ - 4.5.0 + 4.6.0 From 18e9403b92f70a31ee8ed37a5b0885be7fa5727f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Mar 2026 17:17:05 +0000 Subject: [PATCH 2/2] ci: trigger CI checks