build_core: still try to guarentee switching branches without conflicts

git-svn-id: https://rebeccablackos.svn.sourceforge.net/svnroot/rebeccablackos@2660 56e3d1a8-0179-4092-b3e2-9fbbcda0c0a9