I created a branch from trunk. As development on my branch is finished, I want to merge (reintegrate) my branch into trunk. Is there an option or setting to enable? It seems Netbeans 7.1 isn't able...

I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the ...

Within a pre-commit script, is it possible (and if so, how) to identify commits stemming from an svn merge? svnlook changed ... shows files that have changed, but does not differentiate between me...