Git在重新设置基准和壁球合并后删除分支是否安全?

时间:2019-12-18 10:58:50

标签: git git-branch git-merge git-rebase

我有两个功能,即Feature_1和Feature_2,我已将Feature_1重新设置为Feature_2,然后将它们合并为master_1。执行这些操作后,删除feature_1和feature_2是安全的,当我尝试删除它们时,git说它们没有完全合并。

westfarmer@WIN-J9F9E38LDI6 MINGW64 ~/git/gittour_local (master)
$ gg
* fae6319 (HEAD -> master) squash merge feature_1
| * 0347813 (feature_1) add file4.txt
| * b779db9 add file3.txt
| * 3ec733d add .
| * 9256e63 (feature_2) random comments
| * 30710e1 add !
| * 7ace01b newbie job 1 done
|/
* 199c1b0 master job 2
* 7f3625f master job 1
*   d9ed096 merge feature_1, accept full stop
|\
| * c2c5bd8 add full stop
* | fb0a09f add !
|/
* f95cd16 add file2.txt
* c72abfa add file1.txt

westfarmer@WIN-J9F9E38LDI6 MINGW64 ~/git/gittour_local (master)
$ git branch -d feature_1
error: The branch 'feature_1' is not fully merged.
If you are sure you want to delete it, run 'git branch -D feature_1'.

0 个答案:

没有答案