Share
Report
5I need some guidance on merging branches
I looked at a couple different videos and read documents on source control but I am missing a link
I have two VMs running locally, one is my developer machine and is mapped to the DEV branch in VSTS, and I have a build definition for this branch. I did a simple model with a simple extension to change a label and check in and build works well. (The second VM functions as the build vm)
In VS I have dev/metadata mapped to c:/aosservice/packageslocaldirectory and projects is mapped to my local project folder.
In a roundabout way I got the Main and release branches created so that view hierarchy looks right. I want to merge from DEV into Main and then release.
My question has to do with mappings, earlier when I attempted to merge from the DEV branch to the Main branch I get this error
Trunk Main metadata is not mapped.
Which is of course because I didn't map it, but what do I map it to, or is there a better way to merge branches ?
Thanks,
Chris
All responses (
Answers (
