GameCult/Eureka
Watch
9
0
Fork
You've already forked Eureka
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Briefs: a merge pass never rebases on a rejected push #20

Open
eureka wants to merge 2 commits from self/merge-never-rebases into main
pull from: self/merge-never-rebases
merge into: GameCult:main
Conversation 0 Commits 2 Files changed 3 +22 -2
eureka commented 2026-10-13 02:18:26 +00:00
Owner
Copy link

Rebase on a rejected push flattened the reveals-replace-tiers merge to Aetheria master and dropped its merge-time test fixes (master 07854ed5 did not compile; repaired forward in 20cd1d7c). Cut branches keep pull --rebase; merge passes fetch and merge origin/master into their verified merge, re-verify, and push. Changelog entry 2026-10-13.

?? Generated with Claude Code

Rebase on a rejected push flattened the reveals-replace-tiers merge to Aetheria master and dropped its merge-time test fixes (master 07854ed5 did not compile; repaired forward in 20cd1d7c). Cut branches keep pull --rebase; merge passes fetch and merge origin/master into their verified merge, re-verify, and push. Changelog entry 2026-10-13. ?? Generated with [Claude Code](https://claude.com/claude-code)
Rebase flattened the reveals-replace-tiers merge and dropped its merge-time
test fixes; Aetheria master 07854ed5 did not compile. Cut branches keep
pull --rebase; merges to master fetch and merge origin/master instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
An Imagination pass edited the operator's checkout (stale map, beside her
uncommitted work); <path> is now a worktree Self names. Withdrawing a
withdrawal and admitting the next revision in one batch is refused
WouldReinstateOverLater.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This pull request has changes conflicting with the target branch.
  • references/changelog.md
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin self/merge-never-rebases:self/merge-never-rebases
git switch self/merge-never-rebases

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff self/merge-never-rebases
git switch self/merge-never-rebases
git rebase main
git switch main
git merge --ff-only self/merge-never-rebases
git switch self/merge-never-rebases
git rebase main
git switch main
git merge --no-ff self/merge-never-rebases
git switch main
git merge --squash self/merge-never-rebases
git switch main
git merge --ff-only self/merge-never-rebases
git switch main
git merge self/merge-never-rebases
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
GameCult/Eureka!20
No description provided.