Let the git tool properly handle branches (and not push the wrong ones), and let change_locations() do it's job accordingly..