Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

What is the point of TFS Gated check-in committed message - reconcile your workspace with the repository?

What is the point of the following message after gated check-in? It doesn't make sense to me. "If you did not undo your local pending changes when you submitted your check-in, you may need to reconcile your workspace with the repository."

enter image description here

like image 512
dev.e.loper Avatar asked Feb 13 '12 20:02

dev.e.loper


People also ask

What is gated check in TFS?

A gated check-in is a process that restricts developers from merging a broken code into the source control system—something every software company wants to establish.

What is reconcile workspace?

The reconcile command compares the current state of the workspace on disk with the server's view, either to clean the workspace or to promote unpended local changes.

What is gated build in TFS?

Gated checkin is a form of continuous integration build. In TFS, it creates a shelveset containing the code that's being validated, then runs a build of that code. Only if that code builds successfully and all configured unit tests pass does the code actually get committed.


1 Answers

Let's say you are performing a Gated Check-in of a Single file - Progam.cs.

When you perform a Gated Check-in and choose not to undo your local changes, you Shelve Program.cs to the server and perform a build with the Latest code + that Shelveset. If the build succeeds, then TFS automatically Checks in the shelveset (containing your changes to Program.cs) into the source control.

Now, because you didn't undo the changes on your local workspace, you will still have Progam.cs as a "Pending Change" with the status of "edit". This "edit" is not needed as TFS has already checked in your change. Clicking "Reconcile..." will undo that local change and bring it in line with what is on the server.

like image 141
DaveShaw Avatar answered Sep 28 '22 11:09

DaveShaw