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 wil...
Forum Discussion
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.
> 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.