I had some issues when recently building, too, on Linux. You can manually go in your source/tools directory and stash whatever changes the make update did, and then manually pull the latest.
As for your other errors, it’s always safe to first delete your previous build directory to compile with a clean slate when switching branches, did you do that? At the very least you can delete your cmake cache file in your build directory.