Well I had the same thing once.. All I did was too simple to be true..
- Export the changes you made to your local folder
- Delete your Project locally
- Get the app from the teamserver (with the requested branch)
- Import document (your exported changes)
And for me (I really hope it helps for you as well) it worked….