API tools faq
paste
Guest User

Untitled

a guest
Oct 16th, 2018
87
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 15.96 KB | None | 0 0
raw download clone embed print report
  1. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git push origin master
  2. Enter passphrase for key '/c/Users/Trufa/.ssh/id_rsa':
  3. Counting objects: 63, done.
  4. Delta compression using up to 4 threads.
  5. Compressing objects: 100% (37/37), done.
  6. Writing objects: 100% (49/49), 28.15 KiB, done.
  7. Total 49 (delta 28), reused 0 (delta 0)
  8. To git@github.com:trufa/Viernes7.git
  9. 827d1ea..4235781 master -> master
  10. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git branch
  11. * master
  12. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git push origin master
  13. Enter passphrase for key '/c/Users/Trufa/.ssh/id_rsa':
  14. Everything up-to-date
  15. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git add Cocina
  16. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git push origin master
  17. Enter passphrase for key '/c/Users/Trufa/.ssh/id_rsa':
  18. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git commit -am "added cocina project"
  19. [master 77ee1f5] added cocina project
  20. 30 files changed, 605 insertions(+), 0 deletions(-)
  21. create mode 100644 Cocina/Cocina.csproj
  22. create mode 100644 Cocina/Form1.Designer.cs
  23. create mode 100644 Cocina/Form1.cs
  24. create mode 100644 Cocina/Form1.resx
  25. create mode 100644 Cocina/Program.cs
  26. create mode 100644 Cocina/Properties/AssemblyInfo.cs
  27. create mode 100644 Cocina/Properties/Resources.Designer.cs
  28. create mode 100644 Cocina/Properties/Resources.resx
  29. create mode 100644 Cocina/Properties/Settings.Designer.cs
  30. create mode 100644 Cocina/Properties/Settings.settings
  31. create mode 100644 Cocina/Table.cs
  32. create mode 100644 Cocina/bin/Debug/Cocina.exe
  33. create mode 100644 Cocina/bin/Debug/Cocina.pdb
  34. create mode 100644 Cocina/bin/Debug/Cocina.vshost.exe
  35. create mode 100644 Cocina/bin/Debug/Cocina.vshost.exe.manifest
  36. create mode 100644 Cocina/obj/x86/Debug/Cocina.Form1.resources
  37. create mode 100644 Cocina/obj/x86/Debug/Cocina.Properties.Resources.resources
  38. create mode 100644 Cocina/obj/x86/Debug/Cocina.csproj.FileListAbsolute.txt
  39. create mode 100644 Cocina/obj/x86/Debug/Cocina.exe
  40. create mode 100644 Cocina/obj/x86/Debug/Cocina.pdb
  41. create mode 100644 Cocina/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  42. create mode 100644 Cocina/obj/x86/Debug/GenerateResource.read.1.tlog
  43. create mode 100644 Cocina/obj/x86/Debug/GenerateResource.write.1.tlog
  44. rewrite Viernes 7/bin/Debug/Viernes 7.exe (77%)
  45. rewrite Viernes 7/bin/Debug/Viernes 7.pdb (62%)
  46. rewrite Viernes 7/obj/x86/Debug/Viernes 7.exe (77%)
  47. rewrite Viernes 7/obj/x86/Debug/Viernes 7.pdb (62%)
  48. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git push origin master
  49. Enter passphrase for key '/c/Users/Trufa/.ssh/id_rsa':
  50. Counting objects: 46, done.
  51. Delta compression using up to 4 threads.
  52. Compressing objects: 100% (29/29), done.
  53. Writing objects: 100% (35/35), 24.90 KiB, done.
  54. Total 35 (delta 9), reused 0 (delta 0)
  55. To git@github.com:trufa/Viernes7.git
  56. 4235781..77ee1f5 master -> master
  57. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout -b cocina
  58. Switched to a new branch 'cocina'
  59. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git add back
  60. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git commit -am "muestra correctamente ordenes desde a
  61. rchivos"
  62. [cocina 37af2e4] muestra correctamente ordenes desde archivos
  63. 10 files changed, 209 insertions(+), 19 deletions(-)
  64. rewrite Cocina/bin/Debug/Cocina.exe (78%)
  65. delete mode 100644 Cocina/bin/Debug/Cocina.vshost.exe.manifest
  66. rewrite Cocina/obj/x86/Debug/Cocina.exe (78%)
  67. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git commit -am "the lisview now saves indexes of allr
  68. eady clicks and deletes when table closes"
  69. [cocina 488c874] the lisview now saves indexes of allready clicks and deletes when table closes
  70. 6 files changed, 85 insertions(+), 10 deletions(-)
  71. rewrite Cocina/bin/Debug/Cocina.exe (83%)
  72. rewrite Cocina/obj/x86/Debug/Cocina.exe (83%)
  73. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout master
  74. Switched to branch 'master'
  75. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git branch
  76. cocina
  77. * master
  78. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git merge cocina
  79. Updating 77ee1f5..488c874
  80. error: Your local changes to the following files would be overwritten by merge:
  81. Viernes 7.suo
  82. Please, commit your changes or stash them before you can merge.
  83. Aborting
  84. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git merge cocina
  85. Updating 77ee1f5..488c874
  86. error: Your local changes to the following files would be overwritten by merge:
  87. Viernes 7.suo
  88. Please, commit your changes or stash them before you can merge.
  89. Aborting
  90. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout cocina
  91. error: Your local changes to the following files would be overwritten by checkout:
  92. Viernes 7.suo
  93. Please, commit your changes or stash them before you can switch branches.
  94. Aborting
  95. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git commit -am "que cambio?"
  96. [master db1915b] que cambio?
  97. 1 files changed, 0 insertions(+), 0 deletions(-)
  98. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git merge cocina
  99. warning: Cannot merge binary files: Viernes 7.suo (HEAD vs. cocina)
  100.  
  101. Auto-merging Viernes 7.suo
  102. CONFLICT (content): Merge conflict in Viernes 7.suo
  103. Removing Cocina/bin/Debug/Cocina.vshost.exe.manifest
  104. Automatic merge failed; fix conflicts and then commit the result.
  105. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git chechout cocina
  106. git: 'chechout' is not a git command. See 'git --help'.
  107.  
  108. Did you mean this?
  109. checkout
  110. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout cocina
  111. Viernes 7.suo: needs merge
  112. error: you need to resolve your current index first
  113. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git chechout cocina
  114. git: 'chechout' is not a git command. See 'git --help'.
  115.  
  116. Did you mean this?
  117. checkout
  118. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout cocina
  119. Viernes 7.suo: needs merge
  120. error: you need to resolve your current index first
  121. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout -f cocina
  122. Unlink of file 'Cocina/bin/Debug/Cocina.vshost.exe' failed. Should I try again? (y/n) error: unable to unlink old 'Cocin
  123. a/bin/Debug/Cocina.vshost.exe' (Permission denied)
  124. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git reset --merge
  125. error: Untracked working tree file 'Cocina/bin/Debug/Cocina.vshost.exe.manifest' would be overwritten by merge.
  126. fatal: Could not reset index file to revision 'HEAD'.
  127. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git status
  128. # On branch master
  129. # Your branch is ahead of 'origin/master' by 1 commit.
  130. #
  131. # Changes to be committed:
  132. #
  133. # modified: Cocina/Cocina.csproj
  134. # modified: Cocina/Form1.Designer.cs
  135. # modified: Cocina/Form1.cs
  136. # modified: Cocina/Table.cs
  137. # modified: Cocina/bin/Debug/Cocina.exe
  138. # modified: Cocina/bin/Debug/Cocina.pdb
  139. # deleted: Cocina/bin/Debug/Cocina.vshost.exe.manifest
  140. # modified: Cocina/obj/x86/Debug/Cocina.exe
  141. # modified: Cocina/obj/x86/Debug/Cocina.pdb
  142. #
  143. # Unmerged paths:
  144. # (use "git add/rm <file>..." as appropriate to mark resolution)
  145. #
  146. # both modified: Viernes 7.suo
  147. #
  148. # Changes not staged for commit:
  149. # (use "git add/rm <file>..." to update what will be committed)
  150. # (use "git checkout -- <file>..." to discard changes in working directory)
  151. #
  152. # modified: Cocina/Form1.Designer.cs
  153. # modified: Cocina/Form1.cs
  154. # deleted: Cocina/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  155. #
  156. # Untracked files:
  157. # (use "git add <file>..." to include in what will be committed)
  158. #
  159. # Cocina/Info.cs
  160. # Cocina/bin/Debug/Cocina.vshost.exe.manifest
  161. # Viernes 7/Properties/DataSources/
  162. # Viernes 7/Table.cs
  163. # Viernes 7/bin/Debug/Viernes 7.vshost.exe.manifest
  164. # Viernes 7/obj/x86/Debug/ResolveAssemblyReference.cache
  165. # back/
  166. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git chechout -f cocina
  167. git: 'chechout' is not a git command. See 'git --help'.
  168.  
  169. Did you mean this?
  170. checkout
  171. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout -f cocina
  172. Switched to branch 'cocina'
  173. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git log
  174. commit 488c874f2f85a8251b94e1eb43091d5a9baea4a0
  175. Author: Trufa <trufavarela@gmail.com>
  176. Date: Thu May 31 23:57:52 2012 -0300
  177.  
  178. the lisview now saves indexes of allready clicks and deletes when table closes
  179.  
  180. commit 37af2e4f03852558ba32a7a6c8b282602a992acc
  181. Author: Trufa <trufavarela@gmail.com>
  182. Date: Thu May 31 21:57:13 2012 -0300
  183.  
  184. muestra correctamente ordenes desde archivos
  185.  
  186. commit 77ee1f5a98e2cfbb5461b716a57a40b2fa040354
  187. Author: Trufa <trufavarela@gmail.com>
  188. Date: Thu May 31 16:25:40 2012 -0300
  189.  
  190. added cocina project
  191.  
  192. commit 4235781432a3710f9a263a2b2722f6ba954c8c38
  193. Author: Trufa <trufavarela@gmail.com>
  194. Date: Thu May 31 04:49:29 2012 -0300
  195.  
  196. the listview now adds orders
  197.  
  198. commit 3811dc102134801dfdfa6e5c66a773313ed6c537
  199. Author: Trufa <trufavarela@gmail.com>
  200. Date: Thu May 31 04:34:07 2012 -0300
  201.  
  202. listview now displays correectly
  203.  
  204. commit 6129fc7d575c5c26e40a8f3204ff3e0550b4f2eb
  205. Author: Trufa <trufavarela@gmail.com>
  206. Date: Thu May 31 03:48:05 2012 -0300
  207.  
  208. added listview instead of listbox
  209.  
  210. commit b8736cf7fc435269e8948013824adc70d54abc16
  211. Author: Trufa <trufavarela@gmail.com>
  212. Date: Thu May 31 01:22:16 2012 -0300
  213.  
  214. you can now add order to table
  215. Author: Trufa <trufavarela@gmail.com>
  216. Date: Wed May 30 22:11:05 2012 -0300
  217.  
  218. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout 37af2e4f03852558ba32a7a6c8b282602a992acc
  219.  
  220. error: Your local changes to the following files would be overwritten by checkout:
  221. Cocina/bin/Debug/Cocina.exe
  222. Cocina/bin/Debug/Cocina.pdbbcc8a533b9f0
  223. Cocina/obj/x86/Debug/Cocina.exe
  224. Cocina/obj/x86/Debug/Cocina.pdb
  225. Please, commit your changes or stash them before you can switch branches.
  226. Aborting
  227. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git commit -am "seems to be broken"
  228. [cocina 5f41088] seems to be broken
  229. 5 files changed, 0 insertions(+), 0 deletions(-)
  230. rewrite Cocina/bin/Debug/Cocina.exe (79%)
  231. rewrite Cocina/obj/x86/Debug/Cocina.exe (79%)
  232. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout 37af2e4f03852558ba32a7a6c8b282602a992acc
  233.  
  234. Unlink of file 'Cocina/bin/Debug/Cocina.exe' failed. Should I try again? (y/n) y
  235. Unlink of file 'Cocina/bin/Debug/Cocina.exe' failed. Should I try again? (y/n) n
  236. error: unable to unlink old 'Cocina/bin/Debug/Cocina.exe' (Permission denied)
  237. Unlink of file 'Cocina/bin/Debug/Cocina.pdb' failed. Should I try again? (y/n) n
  238. error: unable to unlink old 'Cocina/bin/Debug/Cocina.pdb' (Permission denied)
  239. M Cocina/bin/Debug/Cocina.exe
  240. M Cocina/bin/Debug/Cocina.pdb
  241. Note: checking out '37af2e4f03852558ba32a7a6c8b282602a992acc'.
  242.  
  243. You are in 'detached HEAD' state. You can look around, make experimental
  244. changes and commit them, and you can discard any commits you make in this
  245. state without impacting any branches by performing another checkout.
  246.  
  247. If you want to create a new branch to retain commits you create, you may
  248. do so (now or later) by using -b with the checkout command again. Example:
  249.  
  250. git checkout -b new_branch_name
  251.  
  252. HEAD is now at 37af2e4... muestra correctamente ordenes desde archivos
  253. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git chechout master
  254. git: 'chechout' is not a git command. See 'git --help'.
  255.  
  256. Did you mean this?
  257. checkout
  258. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout master
  259. error: Your local changes to the following files would be overwritten by checkout:
  260. Cocina/bin/Debug/Cocina.exe
  261. Cocina/bin/Debug/Cocina.pdb
  262. Cocina/obj/x86/Debug/Cocina.exe
  263. Cocina/obj/x86/Debug/Cocina.pdb
  264. Viernes 7.suo
  265. Please, commit your changes or stash them before you can switch branches.
  266. error: The following untracked working tree files would be overwritten by checkout:
  267. Cocina/bin/Debug/Cocina.vshost.exe.manifest
  268. Please move or remove them before you can switch branches.
  269. Aborting
  270. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git log
  271. commit 37af2e4f03852558ba32a7a6c8b282602a992acc
  272. Author: Trufa <trufavarela@gmail.com>
  273. Date: Thu May 31 21:57:13 2012 -0300
  274.  
  275. muestra correctamente ordenes desde archivos
  276.  
  277. commit 77ee1f5a98e2cfbb5461b716a57a40b2fa040354
  278. Author: Trufa <trufavarela@gmail.com>
  279. Date: Thu May 31 16:25:40 2012 -0300
  280.  
  281. added cocina project
  282.  
  283. commit 4235781432a3710f9a263a2b2722f6ba954c8c38
  284. Author: Trufa <trufavarela@gmail.com>
  285. Date: Thu May 31 04:49:29 2012 -0300
  286.  
  287. the listview now adds orders
  288.  
  289. commit 3811dc102134801dfdfa6e5c66a773313ed6c537
  290. Author: Trufa <trufavarela@gmail.com>
  291. Date: Thu May 31 04:34:07 2012 -0300
  292.  
  293. listview now displays correectly
  294.  
  295. commit 6129fc7d575c5c26e40a8f3204ff3e0550b4f2eb
  296. Author: Trufa <trufavarela@gmail.com>
  297. Date: Thu May 31 03:48:05 2012 -0300
  298.  
  299. added listview instead of listbox
  300.  
  301. commit b8736cf7fc435269e8948013824adc70d54abc16
  302. Author: Trufa <trufavarela@gmail.com>
  303. Date: Thu May 31 01:22:16 2012 -0300
  304.  
  305. you can now add order to table
  306.  
  307. commit 827d1eab3b01f14bad776064126e3db5e668ad72
  308. Author: Trufa <trufavarela@gmail.com>
  309. Date: Wed May 30 23:17:57 2012 -0300
  310.  
  311. finished listboxes
  312.  
  313. commit b33b121cec3892b16f3ab8d8f41ebcc8a533b9f0
  314. Author: Trufa <trufavarela@gmail.com>
  315. Date: Wed May 30 22:11:05 2012 -0300
  316.  
  317. the listboxes appear display the categories and when cliked show food and price, double click makes popup of item
  318.  
  319. commit f16924b75a706834fd99408613e5bfcd3fedb22a
  320. :
  321.  
  322.  
  323.  
  324.  
  325.  
  326.  
  327.  
  328.  
  329.  
  330.  
  331.  
  332.  
  333.  
  334.  
  335.  
  336.  
  337.  
  338.  
  339.  
  340.  
  341.  
  342.  
  343.  
  344.  
  345.  
  346.  
  347.  
  348.  
  349.  
  350.  
  351.  
  352.  
  353.  
  354.  
  355.  
  356.  
  357.  
  358.  
  359. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git log
  360. commit 37af2e4f03852558ba32a7a6c8b282602a992acc
  361. Author: Trufa <trufavarela@gmail.com>
  362. Date: Thu May 31 21:57:13 2012 -0300
  363.  
  364. muestra correctamente ordenes desde archivos
  365.  
  366. commit 77ee1f5a98e2cfbb5461b716a57a40b2fa040354
  367. Author: Trufa <trufavarela@gmail.com>
  368. Date: Thu May 31 16:25:40 2012 -0300
  369.  
  370. added cocina project
  371.  
  372. commit 4235781432a3710f9a263a2b2722f6ba954c8c38
  373. Author: Trufa <trufavarela@gmail.com>
  374. Date: Thu May 31 04:49:29 2012 -0300
  375.  
  376. the listview now adds orders
  377.  
  378. commit 3811dc102134801dfdfa6e5c66a773313ed6c537
  379. Author: Trufa <trufavarela@gmail.com>
  380. Date: Thu May 31 04:34:07 2012 -0300
  381.  
  382. listview now displays correectly
  383.  
  384. commit 6129fc7d575c5c26e40a8f3204ff3e0550b4f2eb
  385. Author: Trufa <trufavarela@gmail.com>
  386. Date: Thu May 31 03:48:05 2012 -0300
  387.  
  388. added listview instead of listbox
  389.  
  390. commit b8736cf7fc435269e8948013824adc70d54abc16
  391. Author: Trufa <trufavarela@gmail.com>
  392. Date: Thu May 31 01:22:16 2012 -0300
  393.  
  394. you can now add order to table
  395.  
  396. commit 827d1eab3b01f14bad776064126e3db5e668ad72
  397. Author: Trufa <trufavarela@gmail.com>
  398. Date: Wed May 30 23:17:57 2012 -0300
  399.  
  400. finished listboxes
  401.  
  402. commit b33b121cec3892b16f3ab8d8f41ebcc8a533b9f0
  403. Author: Trufa <trufavarela@gmail.com>
  404. Date: Wed May 30 22:11:05 2012 -0300
  405.  
  406. the listboxes appear display the categories and when cliked show food and price, double click makes popup of item
  407.  
  408. commit f16924b75a706834fd99408613e5bfcd3fedb22a
  409. :
  410.  
  411.  
  412. Author: Trufa <trufavarela@gmail.com>
  413. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git checkout cocina
  414. error: Your local changes to the following files would be overwritten by checkout:
  415. Cocina/bin/Debug/Cocina.exe
  416. Cocina/bin/Debug/Cocina.pdb
  417. Cocina/obj/x86/Debug/Cocina.exe
  418. Cocina/obj/x86/Debug/Cocina.pdb
  419. Viernes 7.suo
  420. Please, commit your changes or stash them before you can switch branches.
  421. Aborting
  422. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7> git diff [cocina 488c874]
  423. fatal: ambiguous argument '[cocina': unknown revision or path not in the working tree.
  424. Use '--' to separate paths from revisions
  425. PS C:\Users\Trufa\Documents\Visual Studio 2010\Projects\Viernes 7>
Add Comment
Please, Sign In to add comment
Public Pastes
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!