fpm resolve-conflict <file-name>This command is used to resolve the conflict in the file introduced by attempt, done by the clone, to sync a file having different latest version in the remote and has failed in three way merge.
On successful execution of this command, the file gets out of conflict state and gets ready to be synced.
To understand sync better, read How Sync Works.
According to the types of conflict, this command accepts different flag.
fpm resolve-conflict <file-name>This command is used to resolve the conflict in the file introduced by attempt, done by the clone, to sync a file having different latest version in the remote and has failed in three way merge.
On successful execution of this command, the file gets out of conflict state and gets ready to be synced.
To understand sync better, read How Sync Works.
According to the types of conflict, this command accepts different flag.
fpm resolve-conflict <file-name>This command works in case of edit-edit-conflict.
It opens a default editor with conflict marker, ours and theirs. The ours marker contains the current changes and theirs marker contains the server changes. After doing the required changes and saving it will resolve the conflict. It also updates the file with the changes done in the editor.
This file is now ready to be synced. The probable status of this file is Updated. It can be verified by using fpm sync-status command.
fpm resolve-conflict <file-name>This command works in case of edit-edit-conflict.
It opens a default editor with conflict marker, ours and theirs. The ours marker contains the current changes and theirs marker contains the server changes. After doing the required changes and saving it will resolve the conflict. It also updates the file with the changes done in the editor.
This file is now ready to be synced. The probable status of this file is Updated. It can be verified by using fpm sync-status command.
fpm resolve-conflict --use-ours <file-name>This command works in case of edit-edit-conflict and add-add-conflict.
Sometimes, there’s a need to keep the current/local changes of the file, discarding the changes from the server version. In such case, this command is helpful.
It keeps the current content of the file and the file is no longer file-with-conflict
fpm resolve-conflict --use-ours <file-name>This command works in case of edit-edit-conflict and add-add-conflict.
Sometimes, there’s a need to keep the current/local changes of the file, discarding the changes from the server version. In such case, this command is helpful.
It keeps the current content of the file and the file is no longer file-with-conflict
fpm resolve-conflict --use-theirs <file-name>This command works in case of edit-edit-conflict and add-add-conflict.
This command accomplishes the opposite of --use-ours flag discussed above. It discards the current/local changes and keep the changes present in server version. Then, file is no longer file-with-conflict.
fpm resolve-conflict --use-theirs <file-name>This command works in case of edit-edit-conflict and add-add-conflict.
This command accomplishes the opposite of --use-ours flag discussed above. It discards the current/local changes and keep the changes present in server version. Then, file is no longer file-with-conflict.
fpm resolve-conflict --delete-it <file-name>This command works in case of edit-delete-conflict and delete-edit-conflict.
It deletes the file, discarding changes from server version, in case of edit-delete-conflict, or current changes, in case of delete-edit-conflict and the file is no longer file-with-conflict.
fpm resolve-conflict --delete-it <file-name>This command works in case of edit-delete-conflict and delete-edit-conflict.
It deletes the file, discarding changes from server version, in case of edit-delete-conflict, or current changes, in case of delete-edit-conflict and the file is no longer file-with-conflict.
fpm resolve-conflict --revive-it <file-name>This command works in case of edit-delete-conflict and delete-edit-conflict.
It keeps the changes of the file from server version, in case of edit-delete-conflict, or from current changes, in case of delete-edit-conflict and the file is no longer file-with-conflict.
fpm resolve-conflict --revive-it <file-name>This command works in case of edit-delete-conflict and delete-edit-conflict.
It keeps the changes of the file from server version, in case of edit-delete-conflict, or from current changes, in case of delete-edit-conflict and the file is no longer file-with-conflict.
