From 2dfeaa8aaad98c5daee2cfac238ca05342d39f53 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 12 Jun 2020 18:18:09 +0800
Subject: [PATCH] change

---
 src/forge/Merge/merge_form.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 072d4689..9563e815 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -1,5 +1,4 @@
 import React, { Component } from "react";
-import { Link } from "react-router-dom";
 import { Button, Form, Menu, Input, Select, Tag, Checkbox } from "antd";
 import axios from "axios";
 
@@ -122,8 +121,6 @@ class MergeForm extends Component {
                   isSpin: false,
                 });
                 this.props.history.push(`/projects/${projectsId}/merge`);
-                // const { getDetail } = this.props;
-                // getDetail && getDetail();
               } else {
                 this.setState({
                   isSpin: false,
@@ -143,7 +140,7 @@ class MergeForm extends Component {
             ...values,
             body: desc,
             head: pull,
-            base: head,
+            base: merge,
           })
           .then((result) => {
             if (result) {