Top "Svn-merge" questions

Questions regarding SVN merge operations.

SVN Merge conflict during commit

Eclipse + Subversive plugin On commiting a directory which is out of sync with the SVN a message pops up: Merge …

eclipse svn conflict subversive svn-merge
SVN strategy using branches, and merging changes from trunk into branch

So long time user of SVN, but fairly inexperienced in branching / tagging, and when I have I suspect I'm not …

svn branch branching-and-merging svn-merge svn-update
Svn merging and automatically resolving conflicts

I am new to svn and need to do a lot of merging from trunk to a branch we are …

svn svn-merge
Subversion merge local changes trunk to branch

In my local Subversion working copy, I have a copy of trunk and of a code branch. I've made changes …

svn svn-merge
SVN: Create a branch from branch and merge to trunk

We have a branch B1, and it is still not stable yet so it is not in trunk. But we …

svn svn-merge
svn merge with --reintegrate complains about missing ranges but mergeinfo seems correct

I have a project with with the following structure ^/project/trunk ^/project/branches/mybranch where current HEAD is revision 1048. The …

svn svn-merge
Undo an undesired merge in SVN

We have a repository running SVN. At some moment, to add a feature (lets call it 'branch'), we created a …

svn merge tortoisesvn svn-merge
Subversive: svn: E195016: Cannot merge into a working copy with a switched subtree

I have an issue with Eclipse and Subversive. I'm trying to reintegrate a branch of a project into the trunk. …

svn merge subversive svnkit svn-merge
SVN Merge - Completely "theirs full" - Branch to trunk

I want to merge my branch to trunk and basically want to over-write all the code in branch to the …

svn svn-merge svn-merge-reintegrate
Tortoise SVN Merge "@### must be ancestrally related to @###" Error

Backstory: Got a job as an entry level web developer. Head developer leaves right when I start. All responsibility on …

php svn tortoisesvn svn-merge