I upgraded my rails application in a dedicated `upgrading` branch, made two 
commits, then checkout to the master branch and merged with --squash option:

$ git checkout -b upgrading
$ git add -A
$ git commit -m 'before rails app update'
$ rails app:update
$ git add -A
$ git commit -m "work in progress"
$ git checkout master
$ git merge --squash upgrading
$ git commit -m "upgrade to Rails 5.1.6"

When I tried to delete my `upgrading` branch, git did not proceed with the 
deletion for the following reason:

$ git branch -d upgrading
error: The branch 'upgrading' is not fully merged.
If you are sure you want to delete it, run 'git branch -D upgrading'.

Why is happening this?
I found a Stackoverflow topic <https://stackoverflow.com/a/41947745/5078888> 
on the same issue: what I would like to know is if this happens every time 
there is a merge with --squash option, so that I can safely remove the 
topic branch using the -D option.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to