File tree Expand file tree Collapse file tree
packages/contentstack-branches/src Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ export interface BranchDiffRes {
1313 title : string ;
1414 type : string ;
1515 status : string ;
16+ merge_strategy ?: string ;
1617}
1718
1819export interface BranchDiffSummary {
Original file line number Diff line number Diff line change @@ -196,7 +196,9 @@ function printCompactTextView(branchTextRes: BranchCompactTextRes): void {
196196 if ( branchTextRes . modified ?. length || branchTextRes . added ?. length || branchTextRes . deleted ?. length ) {
197197 cliux . print ( ' ' ) ;
198198 forEach ( branchTextRes . added , ( diff : BranchDiffRes ) => {
199- cliux . print ( chalk . green ( `+ '${ diff . title } ' ${ startCase ( camelCase ( diff . type ) ) } ` ) ) ;
199+ if ( diff . merge_strategy !== 'ignore' ) {
200+ cliux . print ( chalk . green ( `+ '${ diff . title } ' ${ startCase ( camelCase ( diff . type ) ) } ` ) ) ;
201+ }
200202 } ) ;
201203
202204 forEach ( branchTextRes . modified , ( diff : BranchDiffRes ) => {
You can’t perform that action at this time.
0 commit comments