Advertisement
Guest User

Untitled

a guest
Nov 27th, 2014
212
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 27.85 KB | None | 0 0
  1. 2014-11-27 22:07:40.4336|WARN|thread: 1|StandardUserErrors|Showing user error Failed to create a new commit.
  2. LibGit2Sharp.UnmergedIndexEntriesException: Cannot create a tree from a not fully merged index.
  3. at LibGit2Sharp.Core.Ensure.HandleError(Int32 result)
  4. at LibGit2Sharp.Core.Proxy.git_tree_create_fromindex(Index index)
  5. at LibGit2Sharp.Repository.Commit(String message, Signature author, Signature committer, CommitOptions options)
  6. at LibGit2Sharp.RepositoryExtensions.Commit(IRepository repository, String message, Signature author, CommitOptions options)
  7. at LibGit2Sharp.RepositoryExtensions.Commit(IRepository repository, String message, CommitOptions options)
  8. at GitHub.ExclusiveRepositoryConnection.<>c__DisplayClass1.<Commit>b__0()
  9. at System.Reactive.Linq.ObservableImpl.Defer`1.Eval()
  10. at System.Reactive.Linq.ObservableImpl.Defer`1._.Run()
  11. --- End of stack trace from previous location where exception was thrown ---
  12. at System.Reactive.PlatformServices.ExceptionServicesImpl.Rethrow(Exception exception)
  13. at System.Reactive.ExceptionHelpers.ThrowIfNotNull(Exception exception)
  14. at System.Reactive.Subjects.AsyncSubject`1.GetResult()
  15. at GitHub.Helpers.GitClient.<>c__DisplayClass27.<<CreateCommit>b__1e>d__30.MoveNext()
  16. 2014-11-27 22:07:18.5193|INFO|thread: 1|CommandLineHandler|Parsing command line arguments:C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4\GitHub.exe
  17. 2014-11-27 22:07:18.5593|INFO|thread: 1|AppInstanceCommunicator|Starting up as master instance of GitHub for Windows
  18. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| #########################################
  19. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| GitHub for Windows started. VERSION: 2.6.4.1
  20. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| Build version: 9f13322724ea5a881ab9ef4176b40e91c713d901
  21. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| ***************************************
  22. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** ***
  23. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** ***
  24. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** Have a problem? ***
  25. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** Email support@github.com ***
  26. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** and include this file ***
  27. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** ***
  28. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| *** ***
  29. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| ***************************************
  30. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| OS Version: Windows NT 6.3.9600.0 amd64
  31. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| CLR Version: 4.0.30319.34014
  32. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| Current culture: en-US
  33. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| Terminal Services session: no
  34. 2014-11-27 22:07:18.5883|INFO|thread: 8|StartupLogging| Location: C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4\GitHub.exe
  35. 2014-11-27 22:07:18.6163|INFO|thread: 1|HardwareRenderingHelper|Your video card appears to support hardware rendering. If this isn't the case and you see glitches
  36. 2014-11-27 22:07:18.6163|INFO|thread: 1|HardwareRenderingHelper|set the GH_FORCE_SW_RENDERING environment variable to 1
  37. 2014-11-27 22:07:18.6163|INFO|thread: 8|StartupLogging| ActivationUri: https://github-windows.s3.amazonaws.com/GitHub.application
  38. 2014-11-27 22:07:18.7904|WARN|thread: 1|POCOObservableForProperty|ReactiveUI.ReactiveCommandSix`1[[System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]] is a POCO type and won't send change notifications, WhenAny will only return a single value!
  39. 2014-11-27 22:07:18.9385|INFO|thread: 8|GitEnvironment|Process set up with this SSH Agent info: 7064:/tmp/ssh-2WbcWYCaUg9C/agent.5972
  40. 2014-11-27 22:07:18.9385|INFO|thread: 8|GitEnvironment|PATH is C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\cmd;C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin;C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4;C:\Users\Jacob\AppData\Local\GitHub\git-media-amd64_0.2.2;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\ProgramData\Oracle\Java\javapath;c:\Program Files (x86)\Intel\iCLS Client\;c:\Program Files\Intel\iCLS Client\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files\TortoiseSVN\bin
  41. 2014-11-27 22:07:18.9385|INFO|thread: 8|StartupLogging| =====================================================
  42. 2014-11-27 22:07:18.9385|INFO|thread: 8|StartupLogging| DIAGNOSTICS |
  43. 2014-11-27 22:07:18.9385|INFO|thread: 8|StartupLogging| =====================================================
  44. 2014-11-27 22:07:18.9465|INFO|thread: 8|StartupLogging| Git Extracted: 'True:
  45. 2014-11-27 22:07:18.9465|INFO|thread: 8|StartupLogging| PortableGit Dir Exists: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2'
  46. 2014-11-27 22:07:18.9465|INFO|thread: 8|StartupLogging| Git Executable Exists: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin\git.exe'
  47. 2014-11-27 22:07:18.9465|INFO|thread: 8|StartupLogging| ----------------------------------------------------
  48. 2014-11-27 22:07:18.9465|INFO|thread: 8|StartupLogging| PATH: C:\ProgramData\Oracle\Java\javapath;c:\Program Files (x86)\Intel\iCLS Client\;c:\Program Files\Intel\iCLS Client\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files\TortoiseSVN\bin
  49. 2014-11-27 22:07:19.0186|INFO|thread: 1|App|Checking whether application is network deployed.
  50. 2014-11-27 22:07:19.0416|INFO|thread: 8|StartupLogger|Proxy information: (None)
  51. 2014-11-27 22:07:19.0416|INFO|thread: 8|StartupLogger|Couldn't fetch creds for proxy
  52. 2014-11-27 22:07:19.1557|INFO|thread: 1|ClickOnceAppIconHelper|Updating registry with our application icon 'C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4\Images\App.ico'
  53. 2014-11-27 22:07:19.7471|WARN|thread: 1|LogHost|SuppressChangeNotifications was called (perhaps via AddRange), yet you do not
  54. 2014-11-27 22:07:19.7471|WARN|thread: 1|LogHost|have a subscription to ShouldReset. This probably isn't what you want, as ItemsAdded
  55. 2014-11-27 22:07:19.7471|WARN|thread: 1|LogHost|and friends will appear to 'miss' items
  56. 2014-11-27 22:07:19.9792|INFO|thread: 8|PortablePackageManager|Already extracted PortableGit.7z, returning 100%
  57. 2014-11-27 22:07:21.5613|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.DropRepositoryView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  58. 2014-11-27 22:07:21.7784|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.DashboardView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  59. 2014-11-27 22:07:21.8765|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.RepositoryCloneProgress is a POCO type and won't send change notifications, WhenAny will only return a single value!
  60. 2014-11-27 22:07:22.0186|INFO|thread: 1|GitExtractionVisualHelper|Portable Git is already extracted
  61. 2014-11-27 22:07:22.0586|INFO|thread: 1|ReactiveScreen|Activating GitHub.ViewModels.ShellViewModel.
  62. 2014-11-27 22:07:22.0586|INFO|thread: 1|ReactiveScreen|Activating GitHub.ViewModels.DashboardViewModel.
  63. 2014-11-27 22:07:22.4178|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.SourceList is a POCO type and won't send change notifications, WhenAny will only return a single value!
  64. 2014-11-27 22:07:22.5249|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.SourceListRepositoryItem is a POCO type and won't send change notifications, WhenAny will only return a single value!
  65. 2014-11-27 22:07:22.5990|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.RepositoryNotFound is a POCO type and won't send change notifications, WhenAny will only return a single value!
  66. 2014-11-27 22:07:22.6340|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.PopupMenuView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  67. 2014-11-27 22:07:22.7601|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.AddOrCreatePopup is a POCO type and won't send change notifications, WhenAny will only return a single value!
  68. 2014-11-27 22:07:22.8521|INFO|thread: 1|PortablePackageManager|Already extracted gitignore.7z, returning 100%
  69. 2014-11-27 22:07:22.8521|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.CreateRepositoryTab is a POCO type and won't send change notifications, WhenAny will only return a single value!
  70. 2014-11-27 22:07:22.9572|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.BrowseRepositoriesTab is a POCO type and won't send change notifications, WhenAny will only return a single value!
  71. 2014-11-27 22:07:22.9982|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.BrowseRepositoriesList is a POCO type and won't send change notifications, WhenAny will only return a single value!
  72. 2014-11-27 22:07:23.1043|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.TwoFactorView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  73. 2014-11-27 22:07:23.1373|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.CertificateErrorView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  74. 2014-11-27 22:07:23.2084|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.UndoFlashView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  75. 2014-11-27 22:07:23.3725|WARN|thread: 1|LogHost|SuppressChangeNotifications was called (perhaps via AddRange), yet you do not
  76. 2014-11-27 22:07:23.3725|WARN|thread: 1|LogHost|have a subscription to ShouldReset. This probably isn't what you want, as ItemsAdded
  77. 2014-11-27 22:07:23.3725|WARN|thread: 1|LogHost|and friends will appear to 'miss' items
  78. 2014-11-27 22:07:23.5496|WARN|thread: 1|POCOObservableForProperty|GitHub.Validation.ReactivePropertyValidationResult is a POCO type and won't send change notifications, WhenAny will only return a single value!
  79. 2014-11-27 22:07:24.0309|WARN|thread: 1|POCOObservableForProperty|ReactiveUI.ReactiveCommandSix`1[[System.Reactive.Unit, System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]] is a POCO type and won't send change notifications, WhenAny will only return a single value!
  80. 2014-11-27 22:07:24.2541|WARN|thread: 1|LogHost|SuppressChangeNotifications was called (perhaps via AddRange), yet you do not
  81. 2014-11-27 22:07:24.2541|WARN|thread: 1|LogHost|have a subscription to ShouldReset. This probably isn't what you want, as ItemsAdded
  82. 2014-11-27 22:07:24.2541|WARN|thread: 1|LogHost|and friends will appear to 'miss' items
  83. 2014-11-27 22:07:24.6363|WARN|thread: 1|POCOObservableForProperty|ReactiveUI.ReactiveCommandSix`1[[GitHub.Models.ICommitModel, GitHub, Version=2.6.4.1, Culture=neutral, PublicKeyToken=null]] is a POCO type and won't send change notifications, WhenAny will only return a single value!
  84. 2014-11-27 22:07:24.8374|INFO|thread:13|GitClient|Loading commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous
  85. 2014-11-27 22:07:25.2797|INFO|thread:13|RepositoryConnection|Loaded '5' commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous\.
  86. 2014-11-27 22:07:26.0372|INFO|thread: 1|RepositoryHost|Log in from cache for login 'SubjectAlpha' to host 'https://api.github.com/' SUCCEEDED
  87. 2014-11-27 22:07:26.2064|INFO|thread:18|ApplicationShellInitializer|Running post login tasks. ~/.gitconfig is set up with user.name = 'SubjectAlpha' and user.email = 'vegihon@aol.com'
  88. 2014-11-27 22:07:26.3164|INFO|thread:18|SSHKeyHelper|ssh-agent already running
  89. 2014-11-27 22:07:26.3364|INFO|thread:18|PortablePackageManager|Already extracted git-media-amd64.7z, returning 100%
  90. 2014-11-27 22:07:26.3364|INFO|thread:18|GitEnvironment|Process set up with this SSH Agent info: 7064:/tmp/ssh-2WbcWYCaUg9C/agent.5972
  91. 2014-11-27 22:07:26.3364|INFO|thread:18|GitEnvironment|PATH is C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\cmd;C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin;C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4;C:\Users\Jacob\AppData\Local\GitHub\git-media-amd64_0.2.2;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\WINDOWS\System32
  92. 2014-11-27 22:07:26.3875|INFO|thread:18|ProcessWrapper|Starting: Process - FileName: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin\ssh-add.exe', Args: '"C:\Users\Jacob\.ssh\github_rsa"', Working Directory: C:\Users\Jacob\AppData\Local\Temp\
  93. 2014-11-27 22:07:26.4795|INFO|thread: 1|RepositoryViewModel|Refreshing all information for repo
  94. 2014-11-27 22:07:26.6176|WARN|thread: 1|LogHost|SuppressChangeNotifications was called (perhaps via AddRange), yet you do not
  95. 2014-11-27 22:07:26.6176|WARN|thread: 1|LogHost|have a subscription to ShouldReset. This probably isn't what you want, as ItemsAdded
  96. 2014-11-27 22:07:26.6176|WARN|thread: 1|LogHost|and friends will appear to 'miss' items
  97. 2014-11-27 22:07:26.9188|INFO|thread: 7|SSHKeyHelper|Found existing SSH key pair
  98. 2014-11-27 22:07:26.9298|INFO|thread:13|AsyncReaderWriterLock|Acquiring concurrent lock for operation 1: 'LoadHeadForRepo' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  99. 2014-11-27 22:07:26.9298|INFO|thread:13|AsyncReaderWriterLock|Acquired concurrent lock for operation 1: 'LoadHeadForRepo' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  100. 2014-11-27 22:07:27.0509|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.RepositoryView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  101. 2014-11-27 22:07:27.0569|INFO|thread:13|AsyncReaderWriterLock|Released concurrent lock for operation 1: 'LoadHeadForRepo' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  102. 2014-11-27 22:07:27.1960|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.PublishToHostButton is a POCO type and won't send change notifications, WhenAny will only return a single value!
  103. 2014-11-27 22:07:27.2561|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.AheadBehindIndicator is a POCO type and won't send change notifications, WhenAny will only return a single value!
  104. 2014-11-27 22:07:27.4922|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.CommitForm is a POCO type and won't send change notifications, WhenAny will only return a single value!
  105. 2014-11-27 22:07:27.6643|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.NewCommitView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  106. 2014-11-27 22:07:27.7884|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.PublishToHostPopup is a POCO type and won't send change notifications, WhenAny will only return a single value!
  107. 2014-11-27 22:07:27.9185|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.PublishToHostTab is a POCO type and won't send change notifications, WhenAny will only return a single value!
  108. 2014-11-27 22:07:28.0766|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.GitHubLogin is a POCO type and won't send change notifications, WhenAny will only return a single value!
  109. 2014-11-27 22:07:28.2057|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.GitHubEnterpriseLogin is a POCO type and won't send change notifications, WhenAny will only return a single value!
  110. 2014-11-27 22:07:28.3007|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.BranchesPopup is a POCO type and won't send change notifications, WhenAny will only return a single value!
  111. 2014-11-27 22:07:28.5299|INFO|thread:13|AsyncReaderWriterLock|Acquiring concurrent lock for operation 2: 'LoadFilesInWorkingDirectory' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  112. 2014-11-27 22:07:28.5299|INFO|thread: 8|AsyncReaderWriterLock|Acquired concurrent lock for operation 2: 'LoadFilesInWorkingDirectory' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  113. 2014-11-27 22:07:28.5469|INFO|thread:13|GitEnvironment|Process set up with this SSH Agent info: 7064:/tmp/ssh-2WbcWYCaUg9C/agent.5972
  114. 2014-11-27 22:07:28.5469|INFO|thread:13|GitEnvironment|PATH is C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\cmd;C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin;C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4;C:\Users\Jacob\AppData\Local\GitHub\git-media-amd64_0.2.2;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\WINDOWS\System32
  115. 2014-11-27 22:07:28.5469|INFO|thread:13|ProcessWrapper|Starting: Process - FileName: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin\git.exe', Args: 'status --untracked-files=all --porcelain -z ', Working Directory: C:\Users\Jacob\Documents\GitHub\Miscellaneous\
  116. 2014-11-27 22:07:28.5469|INFO|thread: 7|GitClient|Loading commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous
  117. 2014-11-27 22:07:28.5589|INFO|thread: 7|RepositoryConnection|Loaded '1' commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous\.
  118. 2014-11-27 22:07:28.5959|INFO|thread:20|GitClient|Loading commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous
  119. 2014-11-27 22:07:28.6090|INFO|thread:20|RepositoryConnection|Loaded '5' commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous\.
  120. 2014-11-27 22:07:28.7981|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.Controls.CommitListItem is a POCO type and won't send change notifications, WhenAny will only return a single value!
  121. 2014-11-27 22:07:28.8761|INFO|thread:13|AsyncReaderWriterLock|Released concurrent lock for operation 2: 'LoadFilesInWorkingDirectory' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  122. 2014-11-27 22:07:28.9742|INFO|thread: 8|GitClient|Loading commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous
  123. 2014-11-27 22:07:28.9742|INFO|thread: 8|RepositoryConnection|Loaded '5' commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous\.
  124. 2014-11-27 22:07:29.2083|INFO|thread:18|SoftwareUpdateViewModel|Checking for new version
  125. 2014-11-27 22:07:29.2294|WARN|thread: 1|POCOObservableForProperty|GitHub.Views.WorkingDirectoryFileDiffView is a POCO type and won't send change notifications, WhenAny will only return a single value!
  126. 2014-11-27 22:07:29.2844|INFO|thread: 1|RepositoryViewModel|Created Shadow Backup for Repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous => ae9e1e9f6cded875c7b95e829b4bb44fa888c136 in 403ms
  127. 2014-11-27 22:07:29.4595|INFO|thread: 1|SyncButtonViewModel|Getting ahead/behind counts but skipping the fetch.
  128. 2014-11-27 22:07:29.4755|INFO|thread:13|RepositoryConnection|Detecting ahead/behind info for branch: master.
  129. 2014-11-27 22:07:29.5316|INFO|thread:13|RepositoryConnection|branch stats: ahead 1, behind 5
  130. 2014-11-27 22:07:29.5486|INFO|thread: 1|SyncButtonViewModel|Getting ahead/behind counts and running a full fetch.
  131. 2014-11-27 22:07:29.5646|INFO|thread:13|GitEnvironment|Process set up with this SSH Agent info: 7064:/tmp/ssh-2WbcWYCaUg9C/agent.5972
  132. 2014-11-27 22:07:29.5646|INFO|thread:13|GitEnvironment|PATH is C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\cmd;C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin;C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4;C:\Users\Jacob\AppData\Local\GitHub\git-media-amd64_0.2.2;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\WINDOWS\System32
  133. 2014-11-27 22:07:29.5646|INFO|thread:13|ProcessWrapper|Starting: Process - FileName: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin\git.exe', Args: 'fetch origin --prune ', Working Directory: C:\Users\Jacob\Documents\GitHub\Miscellaneous\
  134. 2014-11-27 22:07:32.3384|INFO|thread:13|RepositoryConnection|Detecting ahead/behind info for branch: master.
  135. 2014-11-27 22:07:32.3384|INFO|thread:13|RepositoryConnection|branch stats: ahead 1, behind 6
  136. 2014-11-27 22:07:36.7989|INFO|thread: 1|RepositoryHost|Log in from cache for login 'SubjectAlpha' to host 'https://api.github.com/' SUCCEEDED
  137. 2014-11-27 22:07:36.8099|INFO|thread: 1|SyncButtonViewModel|Starting sync for C:\Users\Jacob\Documents\GitHub\Miscellaneous - master
  138. 2014-11-27 22:07:36.8099|INFO|thread: 1|GitClient|Sync has latest unpublished commit SHA: '926a4a788af5b0d9064238f3cc6b001f9f63b721'
  139. 2014-11-27 22:07:36.8210|INFO|thread:20|AsyncReaderWriterLock|Acquiring exclusive lock for operation 3: 'SyncBranch' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  140. 2014-11-27 22:07:36.8210|INFO|thread: 8|AsyncReaderWriterLock|Acquired exclusive lock for operation 3: 'SyncBranch' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  141. 2014-11-27 22:07:36.8390|INFO|thread:20|GitEnvironment|Process set up with this SSH Agent info: 7064:/tmp/ssh-2WbcWYCaUg9C/agent.5972
  142. 2014-11-27 22:07:36.8390|INFO|thread:20|GitEnvironment|PATH is C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\cmd;C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin;C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4;C:\Users\Jacob\AppData\Local\GitHub\git-media-amd64_0.2.2;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\WINDOWS\System32
  143. 2014-11-27 22:07:36.8390|INFO|thread:20|ProcessWrapper|Starting: Process - FileName: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin\git.exe', Args: 'pull --progress --rebase --prune origin master ', Working Directory: C:\Users\Jacob\Documents\GitHub\Miscellaneous\
  144. 2014-11-27 22:07:37.5715|INFO|thread:18|AsyncReaderWriterLock|Released exclusive lock for operation 3: 'SyncBranch' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  145. 2014-11-27 22:07:37.6385|WARN|thread: 1|StandardUserErrors|Showing user error It appears that you are in the middle of a merge conflict. Open the Git Shell and resolve the conflicts in your working directory before attempting to sync again.
  146. GitHub.IO.ProcessException: M contact.txt
  147. A lua/autorun/join-dc-msg.lua
  148. M lua/autorun/physicsgun.lua
  149. D lua/autorun/plyjoin_dc.lua
  150. U lua/autorun/server/join-dc-msg.lua
  151. U lua/autorun/server/plyjoin_dc.lua
  152. Pull is not possible because you have unmerged files.
  153. Please, fix them up in the work tree, and then use 'git add/rm <file>'
  154. as appropriate to mark resolution, or use 'git commit -a'.
  155. at System.Reactive.PlatformServices.ExceptionServicesImpl.Rethrow(Exception exception)
  156. at System.Reactive.ExceptionHelpers.ThrowIfNotNull(Exception exception)
  157. at System.Reactive.Subjects.AsyncSubject`1.GetResult()
  158. at GitHub.Helpers.GitClient.<>c__DisplayClass11c.<<SyncBranch>b__117>d__123.MoveNext()
  159. 2014-11-27 22:07:38.9440|INFO|thread: 1|SyncButtonViewModel|Completing sync for C:\Users\Jacob\Documents\GitHub\Miscellaneous - master
  160. 2014-11-27 22:07:38.9440|INFO|thread:23|AsyncReaderWriterLock|Acquiring concurrent lock for operation 4: 'LoadHeadForRepo' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  161. 2014-11-27 22:07:38.9440|INFO|thread:23|AsyncReaderWriterLock|Acquired concurrent lock for operation 4: 'LoadHeadForRepo' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  162. 2014-11-27 22:07:38.9610|INFO|thread:23|AsyncReaderWriterLock|Released concurrent lock for operation 4: 'LoadHeadForRepo' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  163. 2014-11-27 22:07:38.9890|INFO|thread:22|AsyncReaderWriterLock|Acquiring concurrent lock for operation 5: 'LoadFilesInWorkingDirectory' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  164. 2014-11-27 22:07:38.9890|INFO|thread:22|AsyncReaderWriterLock|Acquired concurrent lock for operation 5: 'LoadFilesInWorkingDirectory' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  165. 2014-11-27 22:07:38.9940|INFO|thread:22|GitEnvironment|Process set up with this SSH Agent info: 7064:/tmp/ssh-2WbcWYCaUg9C/agent.5972
  166. 2014-11-27 22:07:38.9940|INFO|thread:22|GitEnvironment|PATH is C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\cmd;C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin;C:\Users\Jacob\AppData\Local\Apps\2.0\DKC756Y4.PAP\G5B5JL1A.20P\gith..tion_317444273a93ac29_0002.0006_322e607d54d660d4;C:\Users\Jacob\AppData\Local\GitHub\git-media-amd64_0.2.2;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\WINDOWS\System32
  167. 2014-11-27 22:07:38.9940|INFO|thread:22|ProcessWrapper|Starting: Process - FileName: 'C:\Users\Jacob\AppData\Local\GitHub\PortableGit_ed44d00daa128db527396557813e7b68709ed0e2\bin\git.exe', Args: 'status --untracked-files=all --porcelain -z ', Working Directory: C:\Users\Jacob\Documents\GitHub\Miscellaneous\
  168. 2014-11-27 22:07:38.9940|INFO|thread: 8|GitClient|Loading commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous
  169. 2014-11-27 22:07:39.0060|INFO|thread: 8|RepositoryConnection|Loaded '1' commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous\.
  170. 2014-11-27 22:07:39.0550|INFO|thread: 7|GitClient|Loading commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous
  171. 2014-11-27 22:07:39.0550|INFO|thread: 7|RepositoryConnection|Loaded '5' commits for repo: C:\Users\Jacob\Documents\GitHub\Miscellaneous\.
  172. 2014-11-27 22:07:39.1311|INFO|thread: 8|AsyncReaderWriterLock|Released concurrent lock for operation 5: 'LoadFilesInWorkingDirectory' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  173. 2014-11-27 22:07:39.2382|INFO|thread: 1|SyncButtonViewModel|Getting ahead/behind counts but skipping the fetch.
  174. 2014-11-27 22:07:39.2432|INFO|thread:22|RepositoryConnection|Detecting ahead/behind info for branch: master.
  175. 2014-11-27 22:07:39.2432|INFO|thread:22|RepositoryConnection|branch stats: ahead 1, behind 6
  176. 2014-11-27 22:07:40.3905|INFO|thread:18|AsyncReaderWriterLock|Acquiring exclusive lock for operation 6: 'CreateCommit' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  177. 2014-11-27 22:07:40.3905|INFO|thread:18|AsyncReaderWriterLock|Acquired exclusive lock for operation 6: 'CreateCommit' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
  178. 2014-11-27 22:07:40.3996|INFO|thread:18|ExclusiveRepositoryConnection|Creating Commit
  179. 2014-11-27 22:07:40.4146|INFO|thread:18|ExclusiveRepositoryConnection|Creating new commit with 4 file(s). Merge remote-tracking branch 'origin/master'
  180.  
  181. Conflicts:
  182. lua/autorun/plyjoin_dc.lua
  183. lua/autorun/server/join-dc-msg.lua
  184. lua/autorun/server/plyjoin_dc.lua
  185.  
  186. 2014-11-27 22:07:40.4336|INFO|thread:18|AsyncReaderWriterLock|Released exclusive lock for operation 6: 'CreateCommit' on resource C:\Users\Jacob\Documents\GitHub\Miscellaneous\.git
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement