fix(identity): restack overlay onto latest fork/changes - #285
Closed
omegent-app[bot] wants to merge 0 commit into
Closed
fix(identity): restack overlay onto latest fork/changes#285omegent-app[bot] wants to merge 0 commit into
omegent-app[bot] wants to merge 0 commit into
Conversation
Author
Superseded by rebased tip + auto-resolve in #286; force-update of fork/identity must go through compose with deploy key. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Compose integration auto-rebase of
fork/identityonto currentfork/changesconflicts inapps/mobile/src/features/threads/thread-list-items.tsx(settled-row helpers from changes vs identity participation UI).Fix
Rebased the identity overlay commits onto current
fork/changesand resolved the import conflict by keeping both:ThreadIdentityLeading(identity overlay)resolveSettledRowTimestamp+resolveThreadStatus(changes settled rows)This PR replaces the stale overlay tip so compose can proceed. Prefer rebase merge / force-update of
fork/identityif branch rules allow; otherwise merge and re-run compose.