diff --git a/src/sourceFiles/index.ts b/src/sourceFiles/index.ts index 9663d7563..370ca673b 100644 --- a/src/sourceFiles/index.ts +++ b/src/sourceFiles/index.ts @@ -592,12 +592,14 @@ export namespace SourceFilesModel { export interface MergeBranchRequest { deleteAfterMerge?: boolean; sourceBranchId: number; + acceptSourceChanges?: boolean; dryRun?: boolean; } export interface MergeBranchAttributes { sourceBranchId: number; deleteAfterMerge: boolean; + acceptSourceChanges?: boolean; } export interface MergeBranchSummary { diff --git a/tests/sourceFiles/api.test.ts b/tests/sourceFiles/api.test.ts index cebbc30ca..8fa207dc5 100644 --- a/tests/sourceFiles/api.test.ts +++ b/tests/sourceFiles/api.test.ts @@ -167,6 +167,7 @@ describe('Source Files API', () => { `/projects/${projectId}/branches/${branchId}/merges`, { sourceBranchId, + acceptSourceChanges: true, }, { reqheaders: { @@ -548,6 +549,7 @@ describe('Source Files API', () => { it('Merge branch', async () => { const mergeStatus = await api.mergeBranch(projectId, branchId, { sourceBranchId, + acceptSourceChanges: true, }); expect(mergeStatus.data.identifier).toBe(mergeBranchId); });