Subtree Commands for Use-cases

Pull changes from remote into local project

Run the following from the top-level dir of the local project

  1. List the remote names
    git remote
  2. Get updates from listed remote repository
    git subtree pull --prefix=<folderName> <remoteName> master --squash
  3. Probably things need to be merged manually. This can be done in IntelliJ IDEAS
    Check VCS / Git / Resolve Conflicts after updating VCS status