jam-cloud/upgrade-plan/RECONCILIATION_NOTES.md

Reconciliation Notes

Overview

We are merging promised_based_api_interation into develop (via new branch rails-8).

Common Ancestor

Commit: 245b39f67d05af5811ff7b84aa2b0c84d9cea02e

Key Conflict Areas

The following files have been modified in both branches and will likely raise merge conflicts.

Shared Models (ruby/lib/jam_ruby/models/)

• user.rb:
  • develop: Added RECORDING_PREF_* constants.
  • promise: Added JAM_REASON_PRESENT to validation inclusion.
  • Resolution: Keep both sets of additions.
• active_music_session.rb
• feed.rb
• artifact_update.rb
• recording.rb

Web Controllers (web/app/controllers/)

• api_jam_tracks_controller.rb
• api_search_controller.rb
• artifacts_controller.rb
• landings_controller.rb

Configuration (web/config/)

• routes.rb: Crucial. Likely new routes added in promise for API, and new routes in develop for features.
  • Resolution: Merge carefully to preserve both sets of routes.
• application.rb

Assets

• web/app/assets/javascripts/: Significant divergence. promise has many new React components and stores. develop has maintenance updates.

Admin (admin/)

• config/application.rb: Both branches updated musician_count. No conflict expected.

Strategy

1. Prioritize develop for Legacy UI: Ensure changes to existing views/assets in develop take precedence if promise modified them (unlikely for views, likely for shared JS).
2. Prioritize promise for New API: Ensure new Controllers and Models methods required for jam-ui are preserved.
3. Union of Features: The User model example suggests features were added independently. We want the union of these features.