/workspace/ott_app_store:fetch-xml$ git branch edit_package_page /workspace/ott_app_store:fetch-xml$ git checkout master Switched to branch 'master' /workspace/ott_app_store:master$ git pull Password for 'https://aaa@bitbucket.org': Already up-to-date. /workspace/ott_app_store:master$ git branch -a edit_package_page fetch-xml * master prepare-models remotes/origin/fetch-xml remotes/origin/master remotes/origin/prepare-models /workspace/ott_app_store:master$ git branch -d edit_package_page error: The branch 'edit_package_page' is not fully merged. If you are sure you want to delete it, run 'git branch -D edit_package_page'. /workspace/ott_app_store:master$ git branch -D edit_package_page Deleted branch edit_package_page (was 3bc7673). /workspace/ott_app_store:master$ git branch edit_package_page /workspace/ott_app_store:master$ git checkout edit_package_page Switched to branch 'edit_package_page' /workspace/ott_app_store:edit_package_page$
开始在自己的分支的基础上新建的分支,后来觉得不合适,删除新建分支,
在master的基础上又新建了分支