Show backmerge failed commits when manually finalizing release

tramlinehq · Jan 2, 2025 · f99b5b9 · f99b5b9
1 parent e68c0f3
commit f99b5b9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/components/v2/live_release/finalize_component.html.erb b/app/components/v2/live_release/finalize_component.html.erb
@@ -72,6 +72,10 @@
               branches <%= link_to_external "here", release.compare_url, class: "underline" %>.</p>
             <p>Please ensure that these changes have been manually merged back on
               <code><%= release.train.working_branch %></code> before wrapping up this release.</p>
+            <div class="mt-2">
+              <%= render partial: "shared/divide_collection",
+                         locals: { collection: render(V2::CommitComponent.with_collection(unmerged_changes)) } %>
+            </div>
           </div>
 
           <% unless open_prs? %>