If I check-in file to TFS repository without getting the latest version (i.e, without merging the changes on my side first) then, is one of the version bound to loose? Let us assume v1 is the version on TFS that I forgot to get and merge before checking in, and assume v2 be the version that I checked in. Suppose v1 exists on another machine, can I go ahead re check-in v1 without getting the latest version on the second machine, and redo get-latest and merge on primary machine to have everything recover? What are my options to minimize the loss? What happens if I did not have the second machine with v1? Are there any mechanism in TFS that prevent me from checking in my version without getting the latest from the TFS first?
Asked
Active
Viewed 543 times
0
user6386155
- 825
- 7
- 17
-
1There is the version on the server and the version on your machine. If the versions are different, you MUST merge before checking in. Let's say there are two of you trying to check in at the same time. Whoever checks in first is the winner, and the loser has to merge. – Aug 25 '16 at 20:42
1 Answers
0
Assuming someone have checked in v1 to TFS on another machine during you work on your machine, then you may get conflicts warning. The conflicts maybe automatically resolved, maybe request you resolve manually.
Cece Dong - MSFT
- 29,631
- 1
- 24
- 39