Re: Merging Branches with MS Access Database

I guess I didn't reply to the board. Here's as good as I can get it from
memory...

I only want to place the new databases, from Development, into trunk. I
guess maybe I don't want to merge, do I have to just check out the trunk,
move the new file into the direcotry and recommit? That sounds strange, but
if there's no other method then that's what I must do.

I don't normally, nor intend to continue, using Tortoise for this past this
project. Most of my work is vba code, .net code, or sql server scripts, so
I'm not really worried about this being an issue going forward.

Thanks,
Jason

Jason Lepack wrote:
>
> TortoiseSVN 1.4.5 r8095, FSFS, accessed using file:///
>
> I have two branches, trunk and development, in my repository. In the
> trunk repository is are two different MS Access Databases, one is the
> backend, the other is the front end. In the development branch I modified
> these two databases and added a second front-end for a different class of
> user.
>
> I just recently started with branching, so I need some help.
>
> The Development branch is now stable and I'd like it to be the data that's
> in the trunk. How do I do this? I tried to use merge, but it tells me
> that the two modified dbs are conflicted, and I don't know how to resolve
> them. I read the documentation but it talks about merging within the same
> branch, which makes me think that I may be going about this wrong.
>
> I apprectiate your time and efforts in assisting me with this.
>
> Jason Lepack
>
>
>

-- 
View this message in context: http://www.nabble.com/Merging-Branches-with-MS-Access-Database-tf4554911.html#a13004705
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org