Replace placeholder conflict text with localized copy Split in-progress operation details and actions into clearer rows Keep merge and rebase status messages consistent
Replace placeholder conflict text with localized copy Split in-progress operation details and actions into clearer rows Keep merge and rebase status messages consistent