title: about Code merge and SVN (4 developers 1 mutual server) ---Source code management issue non technical
body: <p>I am now working in a team of 4 (Dev team). We all develop features and fix defects on our local environment. We are using SVN for code management.</p>
  
  <p>A common issue is that:
  Developer A's source code works on his local machine (Version 1.5)
  Developer B's source code works on his local machine (Version 1.2)
  (different version may have some difference on DB structure and source code etc)</p>
  
  <p>When developer A commits his code to SVN (like 0002)
  SVN source code will automatically be deployed to Testing Server for a senior QA for verify</p>
  
  <p>After that, Developer B commits his code to SVN (0003)
  The source code does not work due to the conflict/environment issue for 0002</p>
  
  <p>In this case, I want to ask. How to merge the code and make sure it run (we don't have master version for a period of time)? Any methodologies? </p>