feat: add default merge strategy flag

Author: AbhishekA1509

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.utils.tsx

@@ -442,7 +442,7 @@ const getDiffHeading = <DeploymentTemplate extends boolean>(
     if (isApprovalPending) {
         return (
             <div className="flexbox dc__align-items-center dc__gap-8 ">
-                <ICStamp className="icon-dim-16 scv-5" />
+                <ICStamp className="icon-dim-16 scv-5 dc__no-shrink" />
                 <span className="fs-12 fw-6 cv-5">Approval pending</span>
             </div>
         )

src/index.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { OverrideMergeStrategyType } from '@Pages/Applications'
+
 export interface customEnv {
     SENTRY_ENV?: string
     SENTRY_ERROR_ENABLED?: boolean
@@ -88,6 +90,7 @@ export interface customEnv {
     FEATURE_PROMO_EMBEDDED_MODAL_TITLE?: string
     FEATURE_PROMO_EMBEDDED_IFRAME_URL?: string
     FEATURE_BULK_RESTART_WORKLOADS_FROM_RB: string
+    FEATURE_DEFAULT_MERGE_STRATEGY?: OverrideMergeStrategyType
 }
 declare global {
     interface Window {