make git command more precious to avoid merge of old local branch (thanks to @aschnell for pointing it out )
specify also how to deal with branch specific commits
Merge pull request #34 from yast/maintenance_update

make git command more precious to avoid merge of old local branch (thank...