If you are using third-party version control, two project directories appear after you upgrade your project, rename it, and push it to the remote repository.
If you are using third-party version control, when you attempt to merge branches and conflicts occur, newly added files disappear. AppBuilder does not show newly added files in the list of pending changes and in the Project Navigator.