diff --git a/vuex_demo1/test.txt b/vuex_demo1/test.txt index 9a18cc2..b1211c6 100644 --- a/vuex_demo1/test.txt +++ b/vuex_demo1/test.txt @@ -1,4 +1,4 @@ 测试远程dev分支 主分支修改 -测试合并 +test git pull rebase update dev