index > Team Foundation Server - Version Control > No changes to merge message

No changes to merge message

I'm trying to merge a branch back into the source it came from and Team Foundation Server is telling me, "No changes to merge". If I compare a file I know is different between the branch and source it shows many differences.

Has anyone experienced this before or does anyone know why TFS would say, "No changes to merge" yet show differences between files?

Thanks!
Chris

cm999

There are many possible reasons. The most common would be that someone already did the merge, encountered a conflict, and chose the "keep target branch" (AcceptYours) resolution.

Richard Berg MSFT

Agree. So, if a merge was done and choose something that I wouldn't have I can't merge again and reverse that decision by just performing the merge again?

cm999

No. Having that be the default behavior would be very annoying, obviously. If you want to re-merge something you've already merged, you need to use the /force option.

Richard Berg MSFT

Thanks! I'll read up on that. Makes sense too me.

Finding the /force option via the UI would be nice but understand I can't have everything!

cm999

reply 5

You can use google to search for other answers

More Articles

·What can we do to resolve workspace mapping problems or file down...

·GET does not actually retrieve any files

·TFS Support in Visual Web Developer 2005 Express Edition?

·Source tree collapses - get specific version (forced)

·MSFS - Supporting non Microsoft development languages

·Filtering in the Add Files dialog

·Migrating TFS workspace from TFS Server A to TFS Server B, is thi...

·Help... Directory Branching and SCC specific code in solution and...

·Trying to branch

·HELP: How can I remove team projects from source control only?

Welcome to Bokebb New Update Joins the collection

New Articles

·Merge error: TF14087 "Not all of th��
·TFS API - using ASP.net to checkout the ��
·A client application for Team Foundation?
·BisSubscribe vs TfsSubscribe
·Symbolic Links in TFS?
·Web projects transferred from VSS to TFS��
·View not checked out but modified files
·During a merge, the "Building Chang��
·Add arbitrary files and folders to sourc��
·IDE does not open my main form automatic��
·How can I find out what my team has chec��
·Newbie question...... How to get startin��
·Single source file branch and compilation
·Problems moving TFS from Domain A to Dom��
·Version Control Folder

Hot Articles

·VS Error Setting Assembly Information
·Converting VSS API scripts to TF
·Trouble checking out *.csproj.vspscc fro��
·Files Excluded
·New Team Foundation Server MSSCCI Provid��
·How to handle large numbers of projects ��
·Version History
·Team Foundation Server SCC Api
·VSSConversion While File Checked Out in ��
·Changeset Rollback Problem ..
·PIN and UNPIN event migration problem
·Version Control Small Issue
·Slow VS 2005 performance
·Version vs Changeset
·Merge error: TF14087 "Not all of th��

Recommend Articles

·Add arbitrary files and folders to sourc��
·Is there a way to...?
·How to sync up source code after tempora��
·MSSCCI Provider installation error
·Merging from one branch to another
·Branching Web Projects and IIS virtual d��
·Weird Compare Issue
·Version Control Small Issue
·TreeDiff - another usefull entry point f��
·A client application for Team Foundation?
·Merge operation created a folder behind ��
·Add Version Control Folder to My Favorites
·Putting SQL Server DB Objects under Vers��
·VSSConverter Error TF60041
·Add/Edit Workspace locking up Visual Stu��