CODEWITHSUNDEEP
tfsmergebranch
Rita
Rita

Reputation: 1237

My TFS is not prompting for Merges/ Code differences, simply overwriting? Are there any TFS settings?

I got the latest code for my database project. When i check in my stored proc, It simply overwrote the TFS version and it didn't even prompt for any Merges or differences.

Wondering if there are settings that i have to take care?

Upvotes: 2

Views: 325

Answers (1)

tvanfosson
tvanfosson

Reputation: 532435

TFS will only prompt for merges if someone has checked in (modified) the item after your check out. If the item hasn't changed since your check out, your check in will simply put your version in place over the existing version. That is expected behavior.

Upvotes: 4

Related Questions