RE: Merge, reintegrate, and merge with tree conflicts

> So what is the proper way to continuously perform the workflow we're
> trying to do - that is pull changes from origin path into branch, push
> changes to origin branch from branch, and repeat.
>
> Using bidirectional merge (without reintegrate) seems create severe
> merge conflicts.

Short answer: There is none (with SVN)

Long(er) answer: We were seeing the same problems here with a similar workflow. We ended up with some rules that actually changed the desired workflow (no merges from trunk to feature branch during development) and caused other problems (big changes when reintegrating the feature branch back to trunk).
At the moment we are evaluating a DVCS (Mercurial in our case) which pretty much solves these problems (we have others of course)

If I had to guess by the words you use (pull, push), I'd say you have already used a DVCS, right?

Our evaluation lasts until the 7th of March, so I cannot say what our results are, but I think a DVCS is worth a try.

Best regards
WENZEL Metromec AG
        Andreas Tscharner

-- 
Andreas Tscharner, Development
WENZEL Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone:          +41 (0)81 257 07 00
fax:            +41 (0)81 257 07 01
e-mail:         mailto:andreas.tscharner_at_metromec.ch 
www:            http://www.metromec.ch