openpolitics.com

Once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again. For this reason, if you want to keep working on your feature branch, we recommend destroying it and then re-creating it from the trunk:

$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
      -m "Remove my-calc-branch, reintegrated with trunk in r391."
Committed revision 392.

$ svn copy http://svn.example.com/repos/calc/trunk \
           http://svn.example.com/repos/calc/branches/my-calc-branch
      -m "Recreate my-calc-branch from trunk@HEAD."
Committed revision 393.

"Our study has shown a new and potent effect of lithium in increasing the amplitude, or strength, of the clock rhythms, revealing a novel link between the classic mood-stabiliser, bipolar disorder and body clocks," said lead researcher Dr Qing-Jun Meng, in the University's Faculty of Life Sciences.

.. "Our findings are important for two reasons: firstly, they offer a novel explanation as to how lithium may be able to stabilise mood swings in bipolar patients; secondly, they open up opportunities to develop new drugs for bipolar disorder that mimic and even enhance the effect lithium has on GSK3 without the side-effects lithium salts can cause."