Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have a merge candidate that i cannot merge to a branch from source branch. There are no differences between two branches in the files affected but I cannot undo the changeset.
I even tried to perfrom a ‘no-merge’ merge from command lines of tfs. Still no success.
Every merge attempt says “there are no changes to merge”.
I just want to get rid of this merge candidate
There is a command line option that will let you remove a changeset from the candidates to merge.
The command line:
should do the trick. If it doesn’t I read a couple places that say sometimes you have to use /baseless with this to get rid of changesets that won’t go away.
For more info http://msdn.microsoft.com/en-us/library/bd6dxhfy.aspx