Evaluation of the changes required to wesm/msgvault#299 ("feat: add --http flag to mcp command for StreamableHTTP transport") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
Zero file overlap. Zero textual conflicts. Truly orthogonal.
| File | PR299 | #304 | Overlap? |
|---|
Evaluation of the changes required to wesm/msgvault#298 ("Pr2 branch postgresql dialect") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
Zero textual conflicts on shared files. Only one file is touched by both PRs:
| File | PR298 hunks | #304 hunks | Conflict? |
|---|
Evaluation of the changes required to wesm/msgvault#301 ("feat: expose HTML email content and inline MIME parts via API") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
Zero textual conflicts. Every overlapping file edits a different function or different line range:
| File | PR301 hunks | #304 hunks | Conflict? |
|---|
Evaluation of the changes required to wesm/msgvault#292 ("feat: add search_by_domains MCP tool for multi-domain participant search") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
Zero textual conflicts. Every overlapping file edits a different function or different line range:
| File | PR292 hunks | #304 hunks | Conflict? |
|---|
Evaluation of the changes required to wesm/msgvault#281 ("Add Facebook Messenger DYI import") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
Two real merge conflicts in the query layer; everything else is disjoint or additive.
| File | PR281 hunks | #304 hunks | Mechanical conflict? |
|---|
Evaluation of the changes required to wesm/msgvault#284 ("feat: import-pst — import Microsoft Outlook PST archives") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
Zero textual conflicts. PR284 only adds new files plus go.mod/go.sum entries:
| File | PR284 | #304 | Conflict? |
|---|
Evaluation of the changes required to wesm/msgvault#297 ("feat: add Google service account support for domain-wide delegation") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
No textual conflicts expected. Every overlapping file lands in disjoint hunks:
| File | #297 hunks | #304 hunks | Mechanical conflict? |
|---|
Evaluation of the changes required to wesm/msgvault#303 ("imessage: backfill display names from vCard contacts") once wesm/msgvault#304 (identities-collections-dedup) is merged into upstream main.
One real merge conflict, three trivial:
cmd/msgvault/cmd/import_imessage.go — both branches modify the same hunks:"net/url"; #303 adds "github.com/wesm/msgvault/internal/vcard". → trivial union.
A status line + hooks combo that shows how long since your last API call, so you know when your prompt cache has expired (5-minute TTL). Works per-workspace so multiple sessions don't interfere.
Colors: