Resolves 26 conflicts via manual review. Key decisions: - signature: kept fork's send-time architecture (PR #79), discarded upstream's editor-manipulation functions - WhatsApp incoming: combined fork's two-layer locking (source_id + contact phone) with upstream's blocked-contact drop. Fixed pre-existing regression where echoes were silently dropped - InstallationConfig: upstream's simplified coder (validated against legacy YAML-in-jsonb data) - schema.rb: regenerated, stripped kanban tables from other branches, restored f_unaccent SQL function |
||
|---|---|---|
| .. | ||
| captain | ||
| dialogflow | ||
| dyte | ||
| google_translate | ||
| linear | ||
| openai/openai_prompts | ||
| slack | ||
| bot_processor_service.rb | ||
| llm_base_service.rb | ||
| llm_instrumentation_completion_helpers.rb | ||
| llm_instrumentation_constants.rb | ||
| llm_instrumentation_helpers.rb | ||
| llm_instrumentation_spans.rb | ||
| llm_instrumentation.rb | ||