Quantcast
Channel: Version Control Guide (ex-Branching & Merging)
Browsing all 283 articles
Browse latest View live
↧

New Post: Branch Scheme for Future Releases Using Reparenting

Under your original plan, Why would you ever merge release 2 or release three Into the main branch until release one is deployed into production? Sent from my iPhone On Dec 26, 2012, at 9:40 AM,...

View Article


New Post: Branch Scheme for Future Releases Using Reparenting

It shouldn't happen, but I'm trying to protect against accidents.  In my environment developers swap teams frequently.  A dev who was working on RELEASE_1 yesterday could easily be working on RELEASE_2...

View Article


New Post: Branch Scheme for Future Releases Using Reparenting

If they accidentally merge from rls 3 to rls 1, it will pollute rls 1 just as it would have polluted the main branch. Then when you go to merge rls 1, it has the release 3 stuff in it. I don't see what...

View Article

New Post: Branch Scheme for Future Releases Using Reparenting

I addressed that possibility as well in my proposed scheme.  By denying the ability to perform reverse integration merges on the release branches we do not allow for the possibility of merging from...

View Article

New Post: Branch Scheme for Future Releases Using Reparenting

Is there a possibility of two versions released at the same time?  I doubt that would happen.  A more managable approach would be to have one Service Pack branch off of main and branch your releases...

View Article


New Post: Proper TFS Project, seperate source control and seperate branching...

There was  scenario that I do not see catered for, for projects before TFS, with other tools, we used to follow this method, can you perhaps help me out with some additional guidance.I have a client,...

View Article

New Post: Proper TFS Project, seperate source control and seperate branching...

I don't know what "best practices" are. I'll let someone else speak to that. But the last two places I used TFS, we used one single TFS Project to store all source control for our main products. And we...

View Article

New Post: Proper TFS Project, seperate source control and seperate branching...

A few questions to clarification:What do you mean with Streams?Not sure we are following... What is your definition of  a project? If we use Visual Studio as an analogy, is your project Visual Studio...

View Article


New Post: Proper TFS Project, seperate source control and seperate branching...

I'm glad you posted this reply. I had a serious misconception that I cleared up. I thought that I had to have all my work initiatives ("Projects" in the business sense) share a single TFS Team Project...

View Article


New Post: Reparenting question in VS2012

If I reparent a branch to have no parent, should VS2012 display its original parent as a possible target branch in the merge wizard?It does and I didn't expect that, if it had truly been reparented to...

View Article

New Post: Feature Branch plan and Automated Builds

After studying the branching guide, I've come to the conclusion that the Feature Branch plan would work the best for our team. I'd like to make this as easy as possible for the devs on my team, so I'm...

View Article

New Post: Feature Branch plan and Automated Builds

You will want a separate team build definition per branch there, and they may all use the same build process template that does the workflow you describe. I think there is some confusion here as you...

View Article

New Post: Feature Branch plan and Automated Builds

I'm confused. Spivonious, how many people are on your team? And what do you mean by "currently open solution?"

View Article


New Post: Feature Branch plan and Automated Builds

I was hoping to not have to make two new build definitions for each branch, as these branches can and will be very temporary (sometimes only lasting a few days). Ideally ,our workflow would go like...

View Article

New Post: Feature Branch plan and Automated Builds

I'm starting to think that having a build definition on a feature branch isn't worth anything. Test builds can happen from Main, and another branch can be added to handle releases. Main builds to test...

View Article


New Post: Feature Branch plan and Automated Builds

It depends what your quality bar is for the main branch. If, as in most cases, it contains the latest stable"version of the truth" you need at worst a gated check-in build, or separate the main and...

View Article

New Post: Feature Branch plan and Automated Builds

Yes, we'll need to figure out what "stable" means for us. I'm leaning towards "feature completed and ready for testing". We'd just need to be careful to only merge the changeset from the feature branch...

View Article


New Post: Branching Strategy - (dev, qa, uat, stage) to Branch Per Release

Hi Bill- I do love the simplicity of the strategy but i have a couple of questions I'm hoping you can help me with. After you deploy from DEV to QA or UAT, where do you start working on your next round...

View Article

New Post: Branch to share assemblies and other blobs between team projects?

Is branching a good or even the best way to share assemblies, libraries and other blob assets between different team projects? I don't recall seeing this use case covered in the ranger guide. There is...

View Article

New Post: Branch to share assemblies and other blobs between team projects?

Hi John, Take a look at the "Advanced Version Control Guide" document. There is a section titled "Dependency Management Patterns". It goes through different scenarios of sharing source code, binaries,...

View Article
Browsing all 283 articles
Browse latest View live


<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>