Quantcast
Channel: Team Foundation Server - General forum
Viewing all articles
Browse latest Browse all 6687

Tfs branch problem after baseline merge

$
0
0

hi everyone, 

i have a problem with my development branch.

i don't know exactly what happened, i suppose i made a baseline merge in the wrong direction

and now i have several problems, under the properties of my development branch i have both latest version and workspace versione wrong (very old)

and every time i open my solution tfs ask me to get all the files in the solution, also if i've just clicked on "get latest version".

usually i have my branches like that : 

PRJ - 8.0

PRJ - 8.1

PRJ - Development

the situation is that

PRJ - 8.0 has version 650

PRJ - 8.1 has version 750

PRJ - Development has version 399 

i don't know why....

my latest changeset is the 794 so i'd expect to have PRJ - Development with 794 version...

i'm going mad with this 

do you know a way to make my development branch to return to version 794 ? 

or another way to fix this situation?

thanks for your help 

Jack

EDIT 03/02/2015 09.49

i created a new branch PRJ - Dev-Branch

and this new branch took the version 795

so i manually merge back to PRJ - Development 

with the /force attribute

and then i correctly have the NR - Development with version 796.

BUT

the issue is still there, every time i open the solution tfs ask me to get again a lot of files

and i'm the only developer that is working on this project right now.

i tried also deleting the .suo file

but with no luck




Viewing all articles
Browse latest Browse all 6687

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>