title: Best source control for maintaining devel. and prod. versions of a project
body: <p>What is the best way to manage a devel. and prod. versions of a Java project?</p>
  
  <p>Currently I use SVN and I have 1 working copy and 1 source folder on SVN. <code>The problem is I always work on the same sources and I want 2 sources: 1 with stable code and 1 with new features that are under development. After the devel. code is finished I want to merge with the prod. sources.</code></p>
  
  <p>Please help me with some tutorial or something. I heard about branches/trunk but don't know exactly what that means.</p>
  
  <p>I'm open to use Git if that's more suitable for my situation.</p>