—Git
Synchronizing files performs a pull to update the local database with files from the remote repository, and then pushes any local commits to the remote repository. Changes made during a synchronize affect your current branch. You will see the Resolve Version Conflict dialog if conflicts exist when you synchronize your files.
If a remote file is different from the version in your local database, the Resolve Conflicts dialog opens. If you want to accept all of the differences between the remote and local files, thus merging them, click Auto Merge All. If you want to review the differences in the files side by side and resolve each conflict, click Resolve
For more information see the Flare online Help.