I think my client uses something similar to the Github branching methodology, which is fairly simple (release branch(es), dev branch, feature branches).
The simpler dev/main/release setup can also work just fine depending on how big and active the project is. You want people able to commit their work so it doesn't get lost, without the annoyance of half-done work breaking the build, so for me larger tasks suit a feature-branch well.
- Visitors can check out the Forum FAQ by clicking this link. You have to register before you can post: click the REGISTER link above to proceed. To start viewing messages, select the forum that you want to visit from the selection below. View our Forum Privacy Policy.
- Want to receive the latest contracting news and advice straight to your inbox? Sign up to the ContractorUK newsletter here. Every sign up will also be entered into a draw to WIN £100 Amazon vouchers!
Reply to: Any TFS experts
Collapse
You are not logged in or you do not have permission to access this page. This could be due to one of several reasons:
- You are not logged in. If you are already registered, fill in the form below to log in, or follow the "Sign Up" link to register a new account.
- You may not have sufficient privileges to access this page. Are you trying to edit someone else's post, access administrative features or some other privileged system?
- If you are trying to post, the administrator may have disabled your account, or it may be awaiting activation.
Logging in...
Previously on "Any TFS experts"
Collapse
-
Originally posted by woohoo View PostRegarding branching/merging strategy this may help give you an idea of the options. I've used some of their stuff when setting up a strategy for merging/branching.
Version Control Guide (ex-Branching & Merging) - Downloads
A common approach is to have a dev, main and release(s) branches.
Work in dev, then merge to main. Dev is deployed to your dev area, main is deployed to your test area.
People can continue to develop in the dev branch whilst main is left alone and is ready for proper testing.
When you are happy you can then deploy to production from main and create a release branch. Hotfixes are made in your release branch and merged down to main/dev. Some clients have staging areas others use the test area as staging.
A good tool for merging is Beyond Compare. I recommend this tool!
A good guide for integrating it with Visual Studio..
I've recommended Pluralsight before but I've not used any of their TFS vids. Check em out.
Leave a comment:
-
Originally posted by SimonMac View PostNeed a quick refresher on TFS, specifically around Branching and Merging code, anyone know any good online references?
Version Control Guide (ex-Branching & Merging) - Downloads
A common approach is to have a dev, main and release(s) branches.
Work in dev, then merge to main. Dev is deployed to your dev area, main is deployed to your test area.
People can continue to develop in the dev branch whilst main is left alone and is ready for proper testing.
When you are happy you can then deploy to production from main and create a release branch. Hotfixes are made in your release branch and merged down to main/dev. Some clients have staging areas others use the test area as staging.
A good tool for merging is Beyond Compare. I recommend this tool!
A good guide for integrating it with Visual Studio..
I've recommended Pluralsight before but I've not used any of their TFS vids. Check em out.
Leave a comment:
-
Any TFS experts
Potential client has TFS, can't change it, need someone to get to grips with their source code repository before moving onto change, release and implementation (where my expertise is).
Administered TFS a few years back but was a single stream of work so need to know the fundamentals of branching and merging
Leave a comment:
-
TFS is in some ways very nice, but I do dislike its branching and merging implementation - that every branch has to be stored separately in your working copy for instance.
That said, I find it less of a PITA to get to grips with than Git/Hg. Did you have any specific questions?
Leave a comment:
-
So easy with Git with it being a DVCS rather than centralised, if you have the opportunity to switch, do it.
Leave a comment:
-
Any TFS experts
Need a quick refresher on TFS, specifically around Branching and Merging code, anyone know any good online references?Tags: None
- Home
- News & Features
- First Timers
- IR35 / S660 / BN66
- Employee Benefit Trusts
- Agency Workers Regulations
- MSC Legislation
- Limited Companies
- Dividends
- Umbrella Company
- VAT / Flat Rate VAT
- Job News & Guides
- Money News & Guides
- Guide to Contracts
- Successful Contracting
- Contracting Overseas
- Contractor Calculators
- MVL
- Contractor Expenses
Advertisers
Contractor Services
CUK News
- Streamline Your Retirement with iSIPP: A Solution for Contractor Pensions Sep 1 09:13
- Making the most of pension lump sums: overview for contractors Sep 1 08:36
- Umbrella company tribunal cases are opening up; are your wages subject to unlawful deductions, too? Aug 31 08:38
- Contractors, relabelling 'labour' as 'services' to appear 'fully contracted out' won't dupe IR35 inspectors Aug 31 08:30
- How often does HMRC check tax returns? Aug 30 08:27
- Work-life balance as an IT contractor: 5 top tips from a tech recruiter Aug 30 08:20
- Autumn Statement 2023 tipped to prioritise mental health, in a boost for UK workplaces Aug 29 08:33
- Final reminder for contractors to respond to the umbrella consultation (closing today) Aug 29 08:09
- Top 5 most in demand cyber security contract roles Aug 25 08:38
- Changes to the right to request flexible working are incoming, but how will contractors be affected? Aug 24 08:25
Leave a comment: