How can I indicate that I ALWAYS want the local file to replace the server copy, even if the TFS copy is newer?
if (pendingChanges.GetUpperBound(0)>-1)
ChangeSetNumber = workspace.CheckIn(pendingChanges, filename);
I can see from intelisense that I can specify checkinoptions as a parameter of the CheckIn method, I just canβt find what I need so that it is always checked and ignores any conflict. may occur.
Thanks in advance.
EDIT: I found the TF RESOLVE command "item" / auto: AcceptYours / recursive. So, I think my revised question would be to program equlivant for the / auto: AcceptYours switch?
NecroEDIT: handle conflicts before checking
Conflict [] conflicts = workspace.QueryConflicts (new string [] {TFSProject}, true);
foreach (Conflict conflict in conflicts)
{
conflict.Resolution = Resolution.AcceptTheirs;
workspace.ResolveConflict (conflict);
}
source
share