tag:blogger.com,1999:blog-37804916.post6329383737267788720..comments2023-12-28T01:19:53.688-08:00Comments on Team Foundation Server: How we branch our code in TFSMac Nolandhttp://www.blogger.com/profile/07086101163818736928noreply@blogger.comBlogger11125tag:blogger.com,1999:blog-37804916.post-4087486599094157832012-11-30T00:41:47.419-08:002012-11-30T00:41:47.419-08:00Hi, I have the following question?
I have a featu...Hi, I have the following question?<br /><br />I have a feature branch, branched off from mainline. The branch is kept in sync with the changes on mainline. This is done by merging and merge conflicts had to be resolved. Now the feature is ready and I want to reintegrate the branch back to mainline, but I don't want to resolve the merge conflicts again. Does TFS provide a solution for that?Anonymoushttps://www.blogger.com/profile/04212086606808556739noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-8318011535666990932012-08-20T02:18:15.856-07:002012-08-20T02:18:15.856-07:00What a clear, precise and nice post there. Much ap...What a clear, precise and nice post there. Much appreciated!Claus Konradhttps://www.blogger.com/profile/03906486541117684643noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-45904114785603259692010-11-21T18:29:31.962-08:002010-11-21T18:29:31.962-08:00Hi Dusty. You can branch 2.0 from the 1.0 branch....Hi Dusty. You can branch 2.0 from the 1.0 branch. I guess the main goal is to isolate your code-lines so you can work on the next major release (2.0) and fix bugs or apply service packs to previously released software (1.0). For us, our next major release is done on the mainline. We then branch (e.g. 2.0) from the mainline when the code freeze happens. We then work on those branches when fixes are needed.<br /><br />If you branch 2.0 from 1.0, you can go direct to the 2.0 branch. In this case, the mainline becomes dead in my mind. Or maybe you use it for POC things.<br /><br />By "automerge" do you mean a Wizard to help you do the merge? If so, then yes there is a nice wizard feature. I use it all the time and 90% of the time, it does the full merge for me. All I have to do is click a few buttons. Works slick.<br /><br />Hope this helps.Mac Nolandhttps://www.blogger.com/profile/07086101163818736928noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-90288671763544903492010-11-08T15:01:18.962-08:002010-11-08T15:01:18.962-08:003 Questions:
If we have Main, 1.0, 2.0 branches, ...3 Questions:<br /><br />If we have Main, 1.0, 2.0 branches, why do we branch 2.0 from Main. Why can't we branch 2.0 from 1.0?<br /><br />If we branch 2.0 from 1.0, will we be able to merge from 1.0 to 2.0 directly or do we still need to go through the Main (1.0 -> Main -> 2.0)<br /><br />Is there a way to do automerge in TFS 2010?Dusty Cohenhttps://www.blogger.com/profile/06055772856576012432noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-30549964441550208272010-09-09T17:59:13.785-07:002010-09-09T17:59:13.785-07:00I attempted to provide a training video describing...I attempted to provide a training video describing some of the concepts behind effective branching and merging by using Microsoft's guidance from the ALM Rangers and the Patterns & Practices teams. Hopefully it will help.<br />http://blogs.us.sogeti.com/ericswanson/2010/09/07/effective-branching-and-merging-in-tfs-2010/Eric Swansonhttps://www.blogger.com/profile/04346320800838746021noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-78386237348601427162010-07-12T02:39:45.667-07:002010-07-12T02:39:45.667-07:00Hello My dear Friend i m new here in your blog and...Hello My dear Friend i m new here in your blog and i m expecting more from you ...<br />I m a fresher with TFS ?<br />First of all <br />Can you please tell me about the TFS?<br />What is this ?<br />When we have to use this ?<br />where we can use this ?<br />How can we use this ?<br />All the above question running in my mind can you please help me out.योगेश चन्द्र उप्रेतीhttps://www.blogger.com/profile/17009545633002694199noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-4395526354682719032010-01-15T07:44:07.347-08:002010-01-15T07:44:07.347-08:00I am now setting up our project branching structur...I am now setting up our project branching structure in 2010 beta 2 and am proposing something similar:<br /><br />$/TeamProj/APP/DEV (for mainline development)<br />$/TeamProj/APP/PRE-ALPHA (contains branches of DEV for release hardening)<br />$/TeamProj/APP/REL (contains branches of DEV which are releases)<br /><br />I do not want any development under REL whatsoever. When a branch is created under REL I'd like it to be read only. I'd like this to happen automatically. It seems that the permissions of the new branch are inherited from the parent branch (not REL folder).<br /><br />How can I (easily) automate this?Unknownhttps://www.blogger.com/profile/18067009413480845089noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-18182458055411461422009-02-20T14:24:00.000-08:002009-02-20T14:24:00.000-08:00murail, what I would do is branch off the release ...murail, what I would do is branch off the release for "release" developers and then require them to merge their changes back to the mainline after they are done with the release feature.<BR/><BR/>Actually, I would merge back every few days to the two branches don't deviate too far from each other.Mac Nolandhttps://www.blogger.com/profile/07086101163818736928noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-91760198422876531982009-02-10T08:19:00.000-08:002009-02-10T08:19:00.000-08:00The branching idea seems to be fair enough..but i ...The branching idea seems to be fair enough..but i have a scenario where some of the developers start coding on next release, where other developers remain to work on current release. Then, in that case all the developers cannot use "MainLine" for checking in their code right?..how do we solve this issue in TFSAnonymousnoreply@blogger.comtag:blogger.com,1999:blog-37804916.post-76954074299064253442008-10-20T19:34:00.000-07:002008-10-20T19:34:00.000-07:00Hey Dennis! What we do is go from Release 1.0 to ...Hey Dennis! What we do is go from Release 1.0 to mainline to Release 2.0. <BR/><BR/>In my example, directly going from Release 1.0 to Release 2.0 is not possible. Though for us, that is not a big deal as we typically make the change on the mainline first. Then merge it up.<BR/><BR/>If that does not work for you, then you can go from Release 1.0 to mainline and then back up to Release 2.0.<BR/><BR/>And if that does not work, I think there is the concept of a baseless merge, but I've not looked into it much.<BR/><BR/>Of course, you can always just manually make the changes, but that often becomes laborious if you have a number of changes.<BR/><BR/>Hope that helps.Mac Nolandhttps://www.blogger.com/profile/07086101163818736928noreply@blogger.comtag:blogger.com,1999:blog-37804916.post-84331417075007398892008-10-20T08:32:00.000-07:002008-10-20T08:32:00.000-07:00Hi, Lets say that I have 2 releases (Release1.0 an...Hi, <BR/><BR/>Lets say that I have 2 releases (Release1.0 and Release2.0).<BR/>If I have made bug fixes in Release1.0, how do you merge from Release1.0 to Release2.0. I can only merge Release1.0 into "Mainline" and not to Release2.0. I can only see my "Mainline" in the drop down "Target branch". Any suggestions?<BR/><BR/>Thanx.<BR/>/Dennis Johansson, Itmaskinen ABUnknownhttps://www.blogger.com/profile/00457971868917600001noreply@blogger.com