Home/ Questions/Q 8525647
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-11T08:02:41+00:00

I used Red Gates SVN Source Control to add 2 databases (one branched off

  • 0

I used Red Gates SVN Source Control to add 2 databases (one branched off the other essentially) to a repository, one as the trunk and the other as a branch. I’m now trying to merge the branch back into the trunk, but all I get are Tree Conflicts on the .sql files. I’ve enabled enable-auto-props = yes and set *.sql = svn:mime-type=text/plain in the config file. Am I missing something? I want to be able to do line-by-line merges like normal code, and having a change log would be handy as well.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    This turned out to be my problem:
    SVN how to resolve new tree conflicts when file is added on two branches

    Since I had only done “Initial Commits” to the trunk and the branch both versions of the files were being added, thus the conflict. So the solution is to use a external merge tool and then commit the changes. There really needs to be a more elegant solution to this problem.

    • 0