报错信息
$ export merge_state=$(cat merge_result.txt | jq -r '.state') $ if [ "$merge_state" == "merged" ];then # collapsed multi-line command
![](https://i-blog.csdnimg.cn/blog_migrate/a8beafe03746386c544495dcf2bc5238.png)
同一个dev分支merge之后又修改了再次merge,会有重复commit,从feature分支重新建一个dev,再修改提交merge就成功了。
![](https://i-blog.csdnimg.cn/blog_migrate/acd72a25cec48b14732f2b260a8fb202.png)
报错信息
$ export merge_state=$(cat merge_result.txt | jq -r '.state') $ if [ "$merge_state" == "merged" ];then # collapsed multi-line command
同一个dev分支merge之后又修改了再次merge,会有重复commit,从feature分支重新建一个dev,再修改提交merge就成功了。