feat(sourceFiles): Add acceptSourceChanges in merge branch API request (#581)

Author: RyanCarlisle

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 {

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);
     });