I'd recommend resetting the branch using:
- git reset --hard upstream/Copter-3.5
- git submodule update --recursive
and then maybe do a clean. I still use "make" 'cuz I'm on windows so I'd use "make px4-clean" but that may not be necessary and I'm not immediately sure if that's required when using "waf" and whether "waf" has an equivalent.