API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 1st, 2018
145
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.14 KB | None | 0 0
raw download clone embed print report
  1. error: Your local changes to the following files would be overwritten by merge:
  2. Assembly-CSharp.csproj
  3. Library/CurrentLayout.dwlt
  4. Library/ScriptAssemblies/Assembly-CSharp.dll
  5. Library/ScriptAssemblies/Assembly-CSharp.pdb
  6. Library/ScriptAssemblies/BuiltinAssemblies.stamp
  7. Library/ScriptAssemblies/Unity.Analytics.Android.Editor.dll
  8. Library/ScriptAssemblies/Unity.Analytics.Android.Editor.pdb
  9. Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll
  10. Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.pdb
  11. Library/ScriptAssemblies/Unity.Postprocessing.Editor.dll
  12. Library/ScriptAssemblies/Unity.Postprocessing.Editor.pdb
  13. Library/ScriptAssemblies/Unity.Postprocessing.Runtime.dll
  14. Library/ScriptAssemblies/Unity.Postprocessing.Runtime.pdb
  15. Library/ScriptAssemblies/Unity.ProGrids.Editor.dll
  16. Library/ScriptAssemblies/Unity.ProGrids.Editor.pdb
  17. Library/ScriptAssemblies/Unity.ProGrids.dll
  18. Library/ScriptAssemblies/Unity.ProGrids.pdb
  19. Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
  20. Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.pdb
  21. Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
  22. Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.pdb
  23. Library/ScriptAssemblies/Unity.RenderPipelines.HighDefinition.Editor.dll
  24. Library/ScriptAssemblies/Unity.RenderPipelines.HighDefinition.Editor.pdb
  25. Library/ScriptAssemblies/Unity.RenderPipelines.HighDefinition.Runtime.dll
  26. Library/ScriptAssemblies/Unity.RenderPipelines.HighDefinition.Runtime.pdb
  27. Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
  28. Library/ScriptAssemblies/Unity.ShaderGraph.Editor.pdb
  29. Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
  30. Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb
  31. Library/ScriptAssemblies/Unity.TextMeshPro.dll
  32. Library/ScriptAssemblies/Unity.TextMeshPro.pdb
  33. Library/ScriptMapper
  34. Library/ShaderCache.db
  35. Library/ShaderIncludePaths.txt
  36. Library/StateCache/Hierarchy/9c0ce3-mainStage.json
  37. Library/StateCache/SceneView/e0b405-mainStage.json
  38. Library/assetDatabase3
  39. Library/expandedItems
  40. Library/metadata/00/00000000000000002000000000000000
  41. Library/metadata/00/00000000000000003000000000000000
  42. Library/metadata/00/00000000000000004000000000000000
  43. Library/metadata/00/00000000000000004100000000000000
  44. Library/metadata/00/00000000000000005000000000000000
  45. Library/metadata/00/00000000000000005100000000000000
  46. Library/metadata/00/00000000000000006000000000000000
  47. Library/metadata/00/00000000000000006100000000000000
  48. Library/metadata/00/00000000000000007000000000000000
  49. Library/metadata/00/00000000000000007100000000000000
  50. Library/metadata/00/00000000000000008000000000000000
  51. Library/metadata/00/00000000000000009000000000000000
  52. Library/metadata/00/0000000000000000a100000000000000
  53. Library/metadata/00/0000000000000000b000000000000000
  54. Library/metadata/00/0000000000000000b100000000000000
  55. Library/metadata/00/0000000000000000c000000000000000
  56. Library/metadata/00/0000000000000000c100000000000000
  57. Library/metadata/00/005c4d80949154e5c87348bb9f5d15eb
  58. Library/metadata/00/00730eab5b38c7c498f8c78d2c25934b
  59. Library/metadata/00/007fa1ca3307f1c4daa3a6efa6bba7e1
  60. Library/metadata/00/0082d52fe349b94449238a3d0db01df0
  61. Library/metadata/00/00b9f1cdcb0d93f40b3703a12d4c146f
  62. Library/metadata/00/00c90b339432489468b14dc26ca81899
  63. Library/metadata/00/00dd221e34a6ab349a1196b0f2fab693
  64. Library/metadata/00/00f350a383e9640a49fc7419ed922b0a
  65. Library/metadata/00/00f37057845073e4880c18942abfb094
  66. Library/metadata/01/01178feac7b8a4f49899e0f7228d7da4
  67. Library/metadata/01/0127e82e3b84228408285b49421d6ba8
  68. Library/metadata/01/0161d805a3764c089bef00bfe00793f5
  69. Library/metadata/01/01721b4a922692f4d80ef10751baa70c
  70. Library/metadata/01/018e19d6c1b36224b85b5c0ddd6a895e
  71. Library/metadata/01/01ab4daa0c099e24e90bbb8623a4198b
  72. Library/metadata/01/01b8f0e33ff01164da19412b5fbdc7d4
  73. Library/metadata/01/01cd264c206ae482393dc9d04b26eca0
  74. Library/metadata/01/01e02995805eb483690380a911a657e2
  75. Library/metadata/01/01e02995805eb483690380a911a657e2.info
  76. Library/metadata/01/01e80e004e94f5e48ad1cb83d5701300
  77. Library/metadata/02/025b8dd135d8eac4da1b8178d944d4a6
  78.  
  79. error: The following untracked working tree files would be overwritten by merge:
  80. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Microsoft.CodeAnalysis.CSharp.Workspaces.dll
  81. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Microsoft.CodeAnalysis.CSharp.dll
  82. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Microsoft.CodeAnalysis.Workspaces.Desktop.dll
  83. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Microsoft.CodeAnalysis.Workspaces.dll
  84. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Microsoft.CodeAnalysis.dll
  85. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Mono.Cecil.Mdb.dll
  86. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Mono.Cecil.Pdb.dll
  87. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Mono.Cecil.Rocks.dll
  88. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Mono.Cecil.dll
  89. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/NUnit3.TestAdapter.dll
  90. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.AppContext.dll
  91. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Collections.Immutable.dll
  92. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Composition.AttributedModel.dll
  93. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Composition.Convention.dll
  94. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Composition.Hosting.dll
  95. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Composition.Runtime.dll
  96. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Composition.TypedParts.dll
  97. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Console.dll
  98. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Diagnostics.FileVersionInfo.dll
  99. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Diagnostics.StackTrace.dll
  100. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.IO.Compression.dll
  101. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.IO.FileSystem.Primitives.dll
  102. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.IO.FileSystem.dll
  103. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Reflection.Metadata.dll
  104. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Security.Cryptography.Algorithms.dll
  105. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Security.Cryptography.Encoding.dll
  106. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Security.Cryptography.Primitives.dll
  107. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Security.Cryptography.X509Certificates.dll
  108. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Text.Encoding.CodePages.dll
  109. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Threading.Thread.dll
  110. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.ValueTuple.dll
  111. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Xml.ReaderWriter.dll
  112. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Xml.XPath.XDocument.dll
  113. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Xml.XPath.dll
  114. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.Xml.XmlDocument.dll
  115. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/System.dll
  116. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Unity.CodeAnalysis.Base.dll
  117. Library/PackageCache/com.unity.incrementalcompiler@0.0.42-preview.24/.bin/Unity.Dummy.exe
  118. Library/PackageCache/c
  119. Aborting
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!