Question about merging using Team Foundation service (TFS) and choose merge by change set(s). If I have some changes on a file with 10 different change sets (suppose I add one line and checked in it counted as a change set, then I undo that change and check it, it counted as another change set, then I added back that line and check in, and so on, and by the end, actually the file just got added one line but with 10 change sets), in order to pick that final change on that file, shall I pick all of 10 change sets or just the last change set ?
I am going down to the lab. Do NOT let anyone in. Not even this tiny ad: