error: Your local changes to the following files would be overwritten by merge:
...
Please commit your changes or stash them before you merge.
Aborting
您对以下文件的本地更改将被合并覆盖:
请在合并之前提交更改或保存它们。
异常终止
error: Your local changes to the following files would be overwritten by merge:
...
Please commit your changes or stash them before you merge.
Aborting
您对以下文件的本地更改将被合并覆盖:
请在合并之前提交更改或保存它们。
异常终止
On branch newbranch
Your branch is up to date with 'origin/newbranch'.
nothing to commit, working tree clean
在分支newbranch
你的分支是最新的'origin/newbranch'。
无事可做,工作树干净