title: base mine theirs
body: <p>Just now I've got suggestions to my another question and am trying to merge my feature branch to the working copy of the trunk in the working copy directory of the trunk. Due to a couple of conflicts I'm using KDiff3 to resolve them. However I'm not sure what here Base, Mine and Their mean? In my case (merge branch to trunk): </p>
  
  <p>Mine --- the working copy of the trunk, </p>
  
  <p>Base --- ???</p>
  
  <p>Their --- ???</p>
  
  <p>Another basic question:
  After resolving the conflicts and saving, the edited version will be saved in the local working copy of the trunk. Is my understanding correct?</p>
  
  <p>Actually I've googled awhile in oder to avoid same simple questions which are put forwards here. However I cannot find any simple explanations regarding to these dummy questions.</p>