No announcements
-
0 VotesMerging files across different TFS servers
).Please let me know if there are any options/features/tools (similar to merging files across branches in the same server)to merge ...Unanswered | 1 Replies | 2217 Views | Created by sasusi - Wednesday, November 22, 2017 4:53 AM | Last reply by Andy Li-MSFT - Friday, November 24, 2017 9:54 AM
-
2 Votes
Tools for comaring files of different branches in TFS
Hi, Could anyone please let me know if there are any tools for comparing files of different branches in TFS and merge with the latest one. Or is ...Answered | 3 Replies | 5676 Views | Created by Avinash.k.b - Friday, April 28, 2017 6:12 PM | Last reply by Andy Li-MSFT - Tuesday, May 2, 2017 7:36 AM -
0 Votes
Could tfs merge based on simple file difference?
Could I merge branches in the TFS based on simple file difference?Answered | 1 Replies | 825 Views | Created by mynameismasel - Tuesday, January 15, 2013 9:29 AM | Last reply by Roar Jørstad - Tuesday, January 15, 2013 2:09 PM -
0 Votes
TFS merge file with no change
The merge problem occurred on TFS 2010 server & TFS 2010 client. We have recently migrated to TFS ...Proposed | 11 Replies | 7626 Views | Created by Hangluong - Monday, April 22, 2013 7:53 PM | Last reply by Hangluong - Wednesday, May 1, 2013 2:43 PM -
0 Votes
Merge doesn't work reliably + Suggestions for making Branching and Merging easier to use
branching & merging process (which happens on the server). Creating a branch to do some work and then merging back to the main branch is a very common task; dunno ...Answered | 2 Replies | 4374 Views | Created by ssmorgan - Tuesday, October 3, 2006 12:47 AM | Last reply by Richard Berg - Thursday, October 26, 2006 9:43 PM -
0 Votes
Getting list of changesets eligible for merge can be very slow.
or takes approximately two minutes. It does not seem to matter whether there are 10 or 40 changesets eligible for the merge. During this two minutes our TFS server is ...Answered | 3 Replies | 3717 Views | Created by Bob Goren - Monday, May 5, 2008 8:02 PM | Last reply by Bob Goren - Monday, June 9, 2008 9:53 PM -
1 Votes
TFS Binary File Merging
Yes, another person here with this complaint. I have a tool that can be used to merge conflicts on my binary file type. But there's just no way it seems to get TFS to even ...Answered | 9 Replies | 5347 Views | Created by Survias - Thursday, May 24, 2012 2:40 PM | Last reply by Survias - Monday, June 11, 2012 4:46 PM -
0 Votes
Difference in categories across VSTS and TFS
for on-prem . Does this imply, that from now on we cannot have a single extension to cater to both VSTS and TFS since the vss-extension.json file will be ...Proposed | 1 Replies | 140 Views | Created by Vinita Sanghi - Tuesday, November 20, 2018 5:27 AM | Last reply by AjayKumar-MSFT - Tuesday, November 20, 2018 11:10 AM -
0 Votes
Custom UI Backstage merges across different diagrams
Seems I was missing out the unregister of the custom ui. This seems to clear out the backstage. Still not sure why backstage would persist across different documents.Answered | 1 Replies | 4240 Views | Created by Andy-W (UK) - Friday, January 13, 2012 10:07 AM | Last reply by Andy-W (UK) - Friday, January 13, 2012 2:00 PM -
0 Votes
Merge says "no changes" but files *ARE* different
pending the RI. Thus, when you checked in, TFS detected that the file had different contents -- new contents that have not been merged to Development -- and ...Answered | 5 Replies | 8646 Views | Created by Aleth - Wednesday, November 29, 2006 11:22 PM | Last reply by Richard Berg - Monday, December 4, 2006 5:56 PM -
1 Votes
Custom UI Backstage merges across different documents
Seems I was missing out the unregister of the custom ui. This seems to clear out the backstage. Still not sure why backstage would persist across different diagrams.Answered | 3 Replies | 2993 Views | Created by Andy-W (UK) - Friday, January 13, 2012 10:05 AM | Last reply by Andy-W (UK) - Monday, January 16, 2012 10:15 AM -
0 Votes
TFS 2013 Git Team Projects Merge across GIT Team projects??
Dear Team, Need quick input on following question. How to perform merge across TFS 2013 Git Team ...Answered | 1 Replies | 514 Views | Created by Tarun Raju - Wednesday, February 11, 2015 1:42 PM | Last reply by John Qiao - Thursday, February 12, 2015 7:57 AM -
0 Votes
merging 3 TFS servers
To consolidate three different Team Foundation Servers into one Team Foundation Server and upgrade to TFS 2008 SP1.Answered | 3 Replies | 5952 Views | Created by Deepak Srinivasan - Sunday, August 24, 2008 5:05 AM | Last reply by Hua Chen - Tuesday, August 26, 2008 1:38 AM -
0 Votes
Merging Across Team Projects
with you, to create a batch file to execute the Tf merge /baseless command lines is the better way. We are trying to better understand customer views on social ...Answered | 2 Replies | 513 Views | Created by Miguel Carlito - Tuesday, October 15, 2013 7:16 PM | Last reply by John Qiao - Friday, October 18, 2013 5:11 AM -
1 Votes
TFS Source Control Server on different TFS server.
Can you house TFS source control on a server in a different location than the main TFS installation? I have a client who wants to keep all source code on ...Answered | 2 Replies | 2582 Views | Created by Jonathon Stevens - Monday, January 9, 2012 6:43 PM | Last reply by John Qiao - Tuesday, January 10, 2012 3:00 AM -
1 Votes
TFS Merging Issue for Pdf & Xls Files
, simultaneously two people are working on same file (file type is xls and pdf) in two different branches, after that we want to merge both the branch changes to ...Answered | 1 Replies | 2270 Views | Created by Vavilala - Thursday, January 31, 2013 12:44 PM | Last reply by Fokko Veegens - Thursday, January 31, 2013 1:50 PM -
0 Votes
merge different pieces of a wmv files
Hi Bruno, as far as i know. you can not merge Video file in Silverlight. but you can try in C# check below linkAnswered | 1 Replies | 1089 Views | Created by bruno2005 - Saturday, March 10, 2012 2:46 PM | Last reply by VikkyBadal - Sunday, March 11, 2012 12:00 AM -
0 Votes
Auto Merge to different branches using TFS CI
guide here from the ALM Rangers that explains the differentAnswered | 5 Replies | 4357 Views | Created by Surya Architect - Friday, April 7, 2017 6:20 AM | Last reply by Andy Li-MSFT - Monday, April 17, 2017 7:47 AM -
1 Votes
My TFS is not propmting for Merges/ Code differences? Are there any TFS settings?
In on your project, it will simply overwrite the TFS version, that’s normally in TFS Source Control. If you want to view the different for that stored proc ...Answered | 1 Replies | 2493 Views | Created by sairam2425 - Wednesday, December 14, 2011 9:19 PM | Last reply by John Qiao - Thursday, December 15, 2011 3:20 AM -
0 Votes
TFS merging not done completely
I have a server setup with TFS 2012 in it and more than 20 users are using the TFS for different projects. I recently found that when doing check-in if the project ... - Items 1 to 20 of 1768034 Next ›
No announcements
