Pull changes from remote into local project
Run the following from the top-level dir of the local project
- List the remote names
git remote - Get updates from listed remote repository
git subtree pull --s subtree <remoteName> prefix=<folderName> <remoteName> master --squash - Probably things need to be merged manually. This can be done in IntelliJ IDEAS
Check VCS / Git / Resolve Conflicts after updating VCS status