Forum Discussion

joffre's avatar
joffre
Regular Contributor
12 years ago

Doubt about teamwork with sharing projects

Doubts:



1) When the message attached appears, and I click YES (or YES TO ALL) if other user changed something I'm working with will be superimposed?

2) If I click NO (or NO TO ALL), what will happen?



I'm worried about losing data or hinder my colleagues job.
  • TanyaYatskovska's avatar
    TanyaYatskovska
    Icon for Alumni rankAlumni
    12 years ago

    Hi Joffre,


     


    If you click NO, you will work with the current/local file version. I recommend that you refer to the "Teamwork" article and those related to learn how to work with one project in your team.


     

  • joffre's avatar
    joffre
    Regular Contributor
    12 years ago
    I know that I'll work with the current/local version, that I'll keep the version that I'm working at.



    But by doing that I'll erase my colleagues changes? If we are working at the same script file, is it possible to fix conflicts?
  • AlexKaras's avatar
    AlexKaras
    Icon for Champion Level 3 rankChampion Level 3
    12 years ago
    Hi Joffre,



    > If we are working at the same script file, is it possible to fix conflicts?

    You will have to merge those two files with some third-party merging tool.



    My personal opinion is that merging is an evil that must be avoided by any means.

    If you and someone else can change absolutely unrelated parts of the same source file this may be an indication that this source file can be split into two separate ones.