Realizando merge no TFS com ferramentas parceiras
O controle de versões do TFS 2010 possui um controle de versões bem avançado. Possui também uma ferramenta visual para realizar 2-way merges. Porém, muitas pessoas preferem usar outras ferramentas de merge e que também possuam 3 janelas (para realizar 3-way merges).
O TFS 2010 é extensível e maleável o suficiente para permitir o uso de outras ferramentas de merge!
Uma ferramenta que acho bem interessante para realizar merges é o KDiff3.
Vamos então ao passo a passo simples para configurar o uso do KDiff3 com o TFS 2010!Vá no Visual Studio ou no Team Explorer Client e abra o menu Tools / Options:
A janela de configuração aparecerá. Selecione Source Control / Visual Studio Team Foundation Server. Na janela clique "Configure User Tools...":
A janela "Configure User Tools" aparecerá:
Clique em "Add..."
Preencha com as informações de extensões de arquivos que serão usados pela ferramenta e o tipo de operação que estará associado com a ferramenta (lembre de fazer isso para "Compare" e para "Merge"). Escreva depois o comando e os argumentos da ferramenta. Para o KDiff3 use os seguintes argumentos:
- Para "Compare": %1 --fname %6 %2 --fname %7
- Para "Merge": %3 --fname %8 %2 --fname %7 %1 --fname %6 -o %4
Pronto! Agora você utilizará o KDiff3 para realizar merges e comparações de código-fonte.
Para usar outras ferramentas e todos os comandos e argumentos para cada uma delas recomendo o blog post de James Manning diff/merge configuration in Team Foundation.
Até a próxima e bons merges!
publicado por José Papo, MSc @ 11:11 AM
11 comentários
11 Comentários:
An electronic book (variously: e-book, eBook, e-Book, ebook, digital book, or even e-edition) is a book-length publication in digital form, consisting of text, images, or both, readable on computers or other electronic devices.
http://www.amazon.com/Good-Dragons-Have-Wonton-Breakfast-ebook/dp/B00K0QIIUS/ref=sr_1_2?ie=UTF8&qid=1398934359&sr=8-2&keywords=long+wong+charlie
The funniest Asian novel of the year!
We are a pool of experts and techies, who are well versed with QuickBooks and help you diagnose and fix QuickBooks error 1603. Generally, this error occurs when the QB has some missing components to initiate the operation, or when the Windows or QB has corrupted or missing file issue. To fix this problem, you can download and use QuickBooks Tool Hub, which is available from the QuickBooks website. Also, you will need to check and update the Windows and QuickBooks as per the latest version. At times, it needs an expert's hand to fix the issue, so you may consider to contact us as we have already handled and corrected these types of errors.
Get the live traffic and new routes by downloading Garmin Update for free. It needs somehow technical ideas and strong knowledge to make your Garmin products up-to-date more effectively and appropriately. So, if you find yourself not enough skilled, then don’t worry! We will lend you a hand to do this in effort-less way. All you require to do is to give a call at 24/7 helpline number and stay connected. In less time and less effort your Garmin will be updated and hence you can plan for a trip.
From an essential paper in an English organization class to a significant examination work in your significant field, and everything in the middle of, you face day by day exploration, composing, and task fulfillment that rapidly gains out of power. We at UK Writings prepare this and we are to help with both short and long haul tasks regardless of whether your cutoff time is very earnest.
Thanks for sharing the information and keep updating us.This information is really useful to me. Visit Here Vet Recommended Puppy Food
Amazing website, Love it. Great work done. Nice website. Love it. This is really nice.
office.com/setup
Microsoft365.com/setup
Microsoft365.com/setup
ij.start.cannon
office.com/setup
How to Setup Microsoft 365?
This printer is qualified for HP's Instant Ink Program which, for a little month to month charge, permits clients to naturally have their printer advise hp deskjet 3755 all in one printer when it is coming up short on ink to have a new cartridge transported to your entryway. This framework ensures that you will forever have a cartridge all set and holds you back from expecting to continually screen ink levels.
Heathrow Airport Transfers Specialist. Book With Us Today & Save.South croydon Cheap taxi quote.For booking call 02086862777.
Malaga Airport Transfers is a transportation service provider that specializes in transfers to and from Malaga Airport in Spain. They offer a wide range of transportation options including private cars, shared shuttles, and luxury vehicles to suit every need and budget.
Merci d'avoir pris le temps d'écrire un article aussi utile. Pour obtenir des conseils utiles sur la productivité et la croissance personnelle, consultez cet article click test . Ma souris a peut-être besoin de repos car elle a cliqué si rapidement.
My perspective on the subject has been greatly expanded by the information presented in this post, and I am eager to use some of these tactics in my own work. Thank you for sharing such insightful content!
Peacocktv.com/tv
mcafee.com/activate
ifrogot.apple.com
Postar um comentário
<< Home