Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

I am using CM Synergy 6.4.3410 version And each time i do a code change ,if some one else does check in on same file its nightmare We need to reconcile it and take latest version from server then manually do the merging and check in . There is an option for merge in reconcile window,but it actually creates a parallel version. I have found out that Synergy does not do a smart merge.Even though the changes done are in different lines of the file

share|improve this question
    
So what is the question? –  admintech May 20 '10 at 9:25
    
How to merge.I think it was obvious –  Ravisha May 20 '10 at 12:54

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Browse other questions tagged or ask your own question.