title: Subversion reintegrate branch conflicts
body: <p>I'm using <code>svn</code> for version control and have the following question:</p>
  
  <ul>
  <li><p>Let's say I develop something in my <code>feature branch</code> and constantly upstream changes from the <code>trunk</code> <em>(by simply merging them and resolving conflicts).</em> Now, at some moment I made my last upstream merge from <code>trunk</code> and resolved the conflicts. And, for example, right after that <code>merge</code> I somehow manage to <strong>"freeze"</strong> the <code>trunk</code> - all commits to <code>trunk</code> are being rejected and it always remains in the same state.</p></li>
  <li><p>Does this <strong>guarantee</strong> the absence of conflicts when I perform the <code>merge --reintegrate</code> for my <code>feature branch</code>? Or I am missing some other conditions and actions, which might possibly lead to them?</p></li>
  </ul>