Well, Undo *should* work. I'm not sure why it is bringing in arbitrary changes after I make a single change. The change isn't there (even in the files I'm working with), then I change something else, and the changes are there...

Author: Hosch250

RetailCoder.VBE/UI/SourceControl/ChangesViewViewModel.cs

@@ -12,6 +12,9 @@ public class ChangesViewViewModel : ViewModelBase, IControlViewModel
         public ChangesViewViewModel()
         {
             _commitCommand = new DelegateCommand(_ => Commit(), _ => !string.IsNullOrEmpty(CommitMessage) && IncludedChanges != null && IncludedChanges.Any());
+
+            _undoChangesToolbarButtonCommand =
+                new DelegateCommand(fileStatusEntry => UndoChanges((IFileStatusEntry) fileStatusEntry));
         }
 
         private string _commitMessage;
@@ -114,6 +117,22 @@ public ObservableCollection<IFileStatusEntry> UntrackedFiles
             }
         }
 
+        private void UndoChanges(IFileStatusEntry fileStatusEntry)
+        {
+            try
+            {
+                var localLocation = Provider.CurrentRepository.LocalLocation.EndsWith("\\")
+                    ? Provider.CurrentRepository.LocalLocation
+                    : Provider.CurrentRepository.LocalLocation + "\\";
+
+                Provider.Undo(localLocation + fileStatusEntry.FilePath);
+            }
+            catch (SourceControlException ex)
+            {
+                RaiseErrorEvent(ex.Message, ex.InnerException.Message);
+            }
+        }
+
         private void Commit()
         {
             var changes = IncludedChanges.Select(c => c.FilePath).ToList();
@@ -155,6 +174,12 @@ public ICommand CommitCommand
             }
         }
 
+        private ICommand _undoChangesToolbarButtonCommand;
+        public ICommand UndoChangesToolbarButtonCommand
+        {
+            get { return _undoChangesToolbarButtonCommand; }
+        }
+
         public event EventHandler<ErrorEventArgs> ErrorThrown;
         private void RaiseErrorEvent(string message, string innerMessage)
         {

Rubberduck.SourceControl/SourceControlProviderBase.cs

@@ -107,7 +107,7 @@ public virtual void Undo(string filePath)
 
            //GetFileNameWithoutExtension returns empty string if it's not a file
            //https://msdn.microsoft.com/en-us/library/system.io.path.getfilenamewithoutextension%28v=vs.110%29.aspx
-            if (componentName != String.Empty)
+            if (componentName != string.Empty)
             {
                 var component = Project.VBComponents.Item(componentName);
                 Project.VBComponents.RemoveSafely(component);