johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bd sync: 2025-12-27 15:56:42

Browse Source
This commit is contained in:
Steve Yegge
2025-12-27 15:56:42 -08:00
parent 87f535a65e
commit c8b912cbe6
179 changed files with 3051 additions and 10283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/merge/merge.go
View File

@@ -292,14 +292,12 @@ func IsExpiredTombstone(issue Issue, ttl time.Duration) bool {
}
func merge3Way(base, left, right []Issue) ([]Issue, []string) {
return Merge3WayWithTTL(base, left, right, DefaultTombstoneTTL)
return merge3WayWithTTL(base, left, right, DefaultTombstoneTTL)
}
// Merge3WayWithTTL performs a 3-way merge with configurable tombstone TTL.
// merge3WayWithTTL performs a 3-way merge with configurable tombstone TTL.
// This is the core merge function that handles tombstone semantics.
// Use this when you need to configure TTL for testing, debugging, or
// per-repository configuration. For default TTL behavior, use merge3Way.
func Merge3WayWithTTL(base, left, right []Issue, ttl time.Duration) ([]Issue, []string) {
func merge3WayWithTTL(base, left, right []Issue, ttl time.Duration) ([]Issue, []string) {
// Build maps for quick lookup by IssueKey
baseMap := make(map[IssueKey]Issue)
for _, issue := range base {