Two people at the same time you modify a file. Or you accidentally modify someone else's files, or someone else accidentally modifying your objects inadvertently submitted to a remote plant library.
For example: It is now a factory remote file library is this:
I want to change it to this:
Obviously there will be a conflict
then you can
on the project ------ Synchroze Workspace (synchronous comparison) Of course, this step can be omitted team
there is a conflict, then this will be displayed in red
Then on the right you can see
first the file Add to index
Then do their own modification submitted by local record
important things to say three times: Be sure not to push the remote, must not push to a remote, must not push to the remote
and Pull
and then in the local file inside a modified
and then saved
Finally Add to index ---- commit ---- push
Successful conflict resolution
overall steps:
