If user attempts to create branch with same name as current branch, tell him to use reset command

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fix compile error in Release configuration

Regression of 84ced4a0b69a84bf77d0cf3f3d293a6c33df126e.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge remote-tracking branch 'remotes/upstream/master'