git checkout -b bug_XXXX
git bz apply XXXX

ako ne prolazi database update:

git am --abort

git am -3iu /tmp/Update-database-patch-xxxxx.patch

resolve conflict

git add <file>

git am --resolved