Merging into trunk

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear

Locked
bfhogan25
Posts: 17
Joined: Thu May 24, 2007 9:21 pm

Merging into trunk

Post by bfhogan25 » Thu Jun 14, 2007 5:49 pm

When I try to merge a branch into the trunk (which is a must for our releases) it tells me that no changes need to be made even after selecting all the changes in the wizard (except of course the first one).

What am I doing wrong here?

Update: Forgive my ignorance. I thought the trunk I had setup months ago was a default trunk that Vault created. I created it and then created another branch and worked out of that branch.

I found problems with doing it that way so now we were going to develop in the branch and merge the maintenance release branches into the trunk branch when the release was made.

The key to finding my zen was realizing the trunk branch was user created.

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Post by Beth » Fri Jun 15, 2007 7:28 am

I can't tell from your update if you resolved your issue or not. If it's still there, can you post a screenshot where you are seeing that there aren't changes?

Locked