search

jacogr / atom-git-control

Not maintained :(
MIT License
227 stars 70 forks source link

[Win7 / Atom 1.0.5] Cannot Delete Branch #101

Open Stoyvo opened 9 years ago

Stoyvo commented 9 years ago

Git Control displays a message for deleting branches. Upon selecting yes, it should be clear that we want to remove a branch... Instead this error exists:

> git branch -d feat/test-branch
error: The branch 'feat/test-branch' is not fully merged.
If you are sure you want to delete it, run 'git branch -D feat/test-branch'.
'git branch -d feat/test-branch' exited with error code 1
MarcelMue commented 9 years ago

The output git-control provided is coming straight from a git console that is running on your system - so deleting the branch in the way you are trying to do should not work manually aswell.

That said git branch -d provides that warning if some commits from your branch haven't been merged into your main. git branch -D would delete the branch no matter what. I think that it is helpfull to have the lower case d as it warns you about potentially deleting vital commits.

A great explanation of the problem can also be found here