Skip to content

Instantly share code, notes, and snippets.

@bbarker
Created November 19, 2025 12:48
Show Gist options
  • Select an option

  • Save bbarker/64d6c769d01b4ce1b08a8379cfc47e27 to your computer and use it in GitHub Desktop.

Select an option

Save bbarker/64d6c769d01b4ce1b08a8379cfc47e27 to your computer and use it in GitHub Desktop.
Missing history after squash
```
anyxchange/routes_squash_2> switch anyxchange/main
anyxchange/main> merge anyxchange/routes_squash_2
I couldn't automatically merge anyxchange/routes_squash_2 into anyxchange/main. However, I've
added the definitions that need attention to the top of
/home/bbarker/workspace/unison-scratch/anyxchange/scratch-claude-cleaned2.u.
When you're done, you can run
update
to merge your changes back into main and delete the temporary branch. Or, if you decide to cancel
the merge instead, you can run
cancel
to delete the temporary branch and switch back to main.
🧩 anyxchange/merge-routes_squash_2-into-main>
🧩 anyxchange/merge-routes_squash_2-into-main> update
Okay, I'm searching the branch for code that needs to be updated...
Done.
anyxchange/main> history
Note: The most recent namespace hash is immediately below this message.
⊙ 1. #vtgoo6pjvn
+ Adds / updates:
anyxchange.app.cloudHandleRegisterPost anyxchange.app.cloudHandleRegisterPostWithLogging
anyxchange.app.cloudHandleRegisterPostWithMockStorage
anyxchange.app.cloudHandleRegisterPostWithRoles
anyxchange.app.cloudHandleRegisterPostWithTables
anyxchange.app.cloudHandleRegisterPostWithTablesDebug
anyxchange.app.cloudHandlerWithMockStorage anyxchange.app.deployCloud
anyxchange.app.deployCloudWithRoles anyxchange.app.deployLocal
anyxchange.app.deployLocalWithRoles anyxchange.app.homePage
anyxchange.app.registrationErrorPage anyxchange.app.registrationPage
anyxchange.app.renderProfilePage anyxchange.app.tests.watchProfilePageShareLink
anyxchange.app.tests.watchShellAuthLinks anyxchange.listing.templates.createListingPage
anyxchange.listing.templates.editListingPage anyxchange.listing.templates.listingDetailPage
anyxchange.listing.templates.listingsPage anyxchange.listing.templates.myListingsPage
anyxchange.routes.allRoutes anyxchange.routes.home anyxchange.routes.listingsCreateGet
anyxchange.routes.listingsDetail anyxchange.routes.listingsEdit anyxchange.routes.listingsGet
anyxchange.routes.listingsMyGet anyxchange.routes.profileEditGet anyxchange.routes.profileGet
anyxchange.routes.profileUpdate anyxchange.routes.registerGet anyxchange.routes.registerPost
anyxchange.routes.testRoutes anyxchange.routes.usernameProfile
anyxchange.ui.templates.document anyxchange.ui.templates.homePage
anyxchange.ui.templates.homePageContent anyxchange.ui.templates.profileEditPage
anyxchange.ui.templates.profileMain anyxchange.ui.templates.registrationPage
anyxchange.ui.templates.shell anyxchange.ui.templates.watchRegistrationErrorPage
This segment of history starts with a merge. Use `history #som3n4m3space` to view history
starting from a given namespace hash.
⊙ 2. #tdb269sg9n
3. #5k059obmk3
4. #f4qmjeggl4
```
And that's all I see of the history; I'd been adding comments on `main` (and in the feature branches)
using the new comment command, and verifying they were there.
The reflog looks like:
```
anyxchange/main> reflog
Below is a record of recent changes, you can use `reset #abcdef` to reset the current branch to a
previous state.
Tip: Use `diff.namespace 1 7` to compare between points in history.
Branch When Hash Description
1. anyxchange/main 5 mins ago #vtgoo6pjvn merge anyxchange/merge-routes_squash_2-into-main
2. anyxchange/main about 12 hours ago #5k059obmk3 lib.install @unison/routes/releases/7.0.1
3. anyxchange/main about 12 hours ago #oqnvvrav8o merge anyxchange/update-main-2
4. anyxchange/main about 13 hours ago #it41b0n0uv update
5. anyxchange/main Tuesday, 1:17AM #mrff8f1r0l update
6. anyxchange/main Tuesday, 12:11AM #n8h8ueb7cv merge anyxchange/update-main-2
7. anyxchange/main Monday, 11:11PM #2fb03g167n update
8. anyxchange/main Monday, 10:02PM #epg3pt609b update
9. anyxchange/main Monday, 9:38PM #dpa49tq8i6 update
10. anyxchange/main Monday, 7:00PM #2rg0eqrvps update
11. anyxchange/main Monday, 6:39PM #knghpq6vcc merge anyxchange/update-main-2
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment