From d79ca7bc720aef143b93665dcfa460da65c29561 Mon Sep 17 00:00:00 2001
From: Matt Burke <maburke@sep.com>
Date: Fri, 5 Mar 2010 17:20:19 -0500
Subject: [PATCH] Don't clobber shelvesets, unless the user asks for it.

---
 GitTfs/Core/TfsWorkspace.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitTfs/Core/TfsWorkspace.cs b/GitTfs/Core/TfsWorkspace.cs
index e090a10e..d1ff8487 100644
--- a/GitTfs/Core/TfsWorkspace.cs
+++ b/GitTfs/Core/TfsWorkspace.cs
@@ -36,7 +36,7 @@ namespace Sep.Git.Tfs.Core
             {
                 var shelveset = new Shelveset(_workspace.VersionControlServer, shelvesetName, _workspace.OwnerName);
                 shelveset.Comment = _checkinOptions.CheckinComment;
-                _workspace.Shelve(shelveset, _workspace.GetPendingChanges(), ShelvingOptions.Replace);
+                _workspace.Shelve(shelveset, _workspace.GetPendingChanges(), _checkinOptions.Force ? ShelvingOptions.Replace : ShelvingOptions.None);
             }
         }