teahubxyz/time

0 Fork 0

Sync sends Time's merge back to the copy; CHANGELOG conflicts keep both sides #204

Open

teahubxyz wants to merge 10 commits from ceo/sync-back-union into main

pull from: ceo/sync-back-union

Author	SHA1	Message	Date
teahubxyz	7f3042ee28	review: .gitattributes names the root CHANGELOG only ci / test (pull_request) Successful in 45s Details	2026-10-19 22:15:55 +00:00
teahubxyz	72f89982e6	review: CHANGELOG says only Time's merges go back, and what union merge costs ci / test (pull_request) Successful in 46s Details	2026-10-19 22:15:52 +00:00
teahubxyz	3ea8289833	review: tests use Time's real merges, and a push at the home or a rewind on the copy never goes back ci / test (pull_request) Successful in 45s Details	2026-10-19 22:15:49 +00:00
teahubxyz	3ab388154e	review: send back only Time's own merges, under a lease on the copy's branch; a failed home fetch falls through ci / test (pull_request) Failing after 44s Details	2026-10-19 22:15:26 +00:00
teahubxyz	75433e5bb3	review: name Time's git identity for sync; anchor the union pattern to the root CHANGELOG; say what union costs; the conflict hint names who acts ci / test (pull_request) Successful in 46s Details	2026-10-19 22:15:18 +00:00
teahubxyz	51f8e484e9	.gitattributes: a CHANGELOG conflict keeps both sides' lines ci / test (pull_request) Successful in 44s Details	2026-10-19 21:52:10 +00:00
teahubxyz	c95e1accc1	CHANGELOG: sync sends Time's merge back; CHANGELOG conflicts union-merge	2026-10-19 21:52:07 +00:00
teahubxyz	86e845037b	tests: sync sends Time's merge back, the copy wins a divergence, CHANGELOG conflicts union-merge, the imported hint	2026-10-19 21:51:57 +00:00
teahubxyz	d69acab7f7	sync: Time's merge on an imported branch goes back to the copy fast-forward instead of being overwritten	2026-10-19 21:51:34 +00:00
teahubxyz	39556a0360	update_branch keeps both sides of a CHANGELOG conflict; a conflict on an imported branch points at the copy	2026-10-19 21:51:19 +00:00