API tools faq
paste
Guest User

Untitled

a guest
Mar 14th, 2017
38
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.67 KB | None | 0 0
raw download clone embed print report
  1. ==[IDE]== Mar 14, 2017 10:22:56 AM Committing...
  2. Git Commit
  3. ----------
  4. git add C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\DomeinController.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\ui\UC1.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\Speler.java
  5. git commit -m Aangepaste UC1 (nog steeds NullPointerException) C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\DomeinController.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\ui\UC1.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\Speler.java
  6. Commit Log
  7. revision : 91df89af11e96f6642035d0f798f4a71a8ec96e7
  8. author : Stijn Verween <Stijn Verween@192.168.0.136>
  9. date : Mar 14, 2017 10:22:56 AM
  10. summary : Aangepaste UC1 (nog steeds NullPointerException)
  11.  
  12. INFO: End of Commit
  13.  
  14. ==[IDE]== Mar 14, 2017 10:22:57 AM Committing... finished.
  15. ==[IDE]== Mar 14, 2017 10:23:12 AM Pushing - pazaak-g17
  16. git branch
  17. git remote -v
  18. setting up remote: origin
  19. git submodule status
  20. git push https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 refs/heads/master:refs/heads/master
  21. Resolving deltas: 100% (7/7), completed with 7 local objects.
  22.  
  23. Remote Repository Updates
  24. Branch Update : master
  25. Old Id : 823b169f692791876616845149cf29aa6948c8ab
  26. New Id : 91df89af11e96f6642035d0f798f4a71a8ec96e7
  27. Result : OK
  28. Show changes in [Search History] or as [Diff]
  29.  
  30.  
  31. Local Repository Updates
  32. Branch Update : master
  33. Old Id : 823b169f692791876616845149cf29aa6948c8ab
  34. New Id : 91df89af11e96f6642035d0f798f4a71a8ec96e7
  35. Result : FORCED
  36. Show changes in [Search History] or as [Diff]
  37.  
  38. ==[IDE]== Mar 14, 2017 10:23:15 AM Pushing - pazaak-g17 finished.
  39. ==[IDE]== Mar 14, 2017 11:50:02 AM Pulling - pazaak-g17
  40. git remote -v
  41. setting up remote: origin
  42. git fetch https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 +refs/heads/master:refs/remotes/origin/master
  43. Total 5 (delta 4), reused 4 (delta 3), pack-reused 0
  44. Branch : origin/master
  45. Old Id : 91df89af11e96f6642035d0f798f4a71a8ec96e7
  46. New Id : 6a1c4332a2b2cb43b301acb1d07b6faa37780bd5
  47. Result : FAST_FORWARD
  48. Show changes in [Search History] or as [Diff]
  49.  
  50. git merge --ff origin/master
  51. Merge Result: Fast-forward
  52. Merge of HEAD with origin/master:
  53. Commit Log
  54. revision : 6a1c4332a2b2cb43b301acb1d07b6faa37780bd5
  55. author : Simon Anckaert <Simon Anckaert@172.18.183.58>
  56. date : Mar 14, 2017 11:42:17 AM
  57. summary :
  58. Show changes in [Search History] or as [Diff]
  59.  
  60. ==[IDE]== Mar 14, 2017 11:50:03 AM Pulling - pazaak-g17 finished.
  61. ==[IDE]== Mar 14, 2017 11:50:17 AM Looking up moved file...
  62. ==[IDE]== Mar 14, 2017 11:50:17 AM Looking up moved file... finished.
  63. ==[IDE]== Mar 14, 2017 12:20:15 PM Pulling - pazaak-g17
  64. git remote -v
  65. setting up remote: origin
  66. git fetch https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 +refs/heads/master:refs/remotes/origin/master
  67. No update
  68. ==[IDE]== Mar 14, 2017 12:20:16 PM Pulling - pazaak-g17 cancelled.
  69. ==[IDE]== Mar 14, 2017 12:24:08 PM Looking up moved file...
  70. ==[IDE]== Mar 14, 2017 12:24:08 PM Looking up moved file... finished.
  71. ==[IDE]== Mar 14, 2017 12:24:14 PM Reverting Files
  72. git reset 91df89a C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\DomeinController.java
  73. git checkout -- C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\DomeinController.java
  74. ==[IDE]== Mar 14, 2017 12:24:14 PM Reverting Files finished.
  75. ==[IDE]== Mar 14, 2017 12:24:24 PM Looking up moved file...
  76. ==[IDE]== Mar 14, 2017 12:24:24 PM Looking up moved file... finished.
  77. ==[IDE]== Mar 14, 2017 12:24:26 PM Reverting Files
  78. git reset 6a1c433 C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\persistentie\KaartMapper.java
  79. git checkout -- C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\persistentie\KaartMapper.java
  80. src/persistentie/KaartMapper.java
  81. ==[IDE]== Mar 14, 2017 12:24:26 PM Reverting Files finished.
  82. ==[IDE]== Mar 14, 2017 2:16:53 PM Committing...
  83. Git Commit
  84. ----------
  85. git add C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\DomeinController.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\SpelerRepository.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\ui\UC1.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\Speler.java
  86. git commit -m defaultstapel toekennen aan speler werkt C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\DomeinController.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\SpelerRepository.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\ui\UC1.java C:\Users\Deltahhh\Documents\NetBeansProjects\pazaak-g17\src\domein\Speler.java
  87. Commit Log
  88. revision : b519b12c89fd1a9340cd187c66bb4ddc691aeb4b
  89. author : Stijn Verween <Stijn Verween@192.168.0.136>
  90. date : Mar 14, 2017 2:16:53 PM
  91. summary : defaultstapel toekennen aan speler werkt
  92.  
  93. INFO: End of Commit
  94.  
  95. ==[IDE]== Mar 14, 2017 2:16:53 PM Committing... finished.
  96. ==[IDE]== Mar 14, 2017 2:17:05 PM Pushing - pazaak-g17
  97. git branch
  98. git remote -v
  99. setting up remote: origin
  100. git submodule status
  101. git push https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 refs/heads/master:refs/heads/master
  102.  
  103. Remote Repository Updates
  104. Branch Update : master
  105. Old Id : 44e667bb12003af82e7d60e1c6bdb2593db30403
  106. New Id : b519b12c89fd1a9340cd187c66bb4ddc691aeb4b
  107. Result : REJECTED_NONFASTFORWARD
  108.  
  109. Local Repository Updates
  110. ==[IDE]== Mar 14, 2017 2:17:11 PM Pushing - pazaak-g17 finished.
  111. ==[IDE]== Mar 14, 2017 2:17:32 PM Pushing - pazaak-g17
  112. git branch
  113. git remote -v
  114. setting up remote: origin
  115. git submodule status
  116. git push https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 refs/heads/master:refs/heads/master
  117.  
  118. Remote Repository Updates
  119. Branch Update : master
  120. Old Id : 44e667bb12003af82e7d60e1c6bdb2593db30403
  121. New Id : b519b12c89fd1a9340cd187c66bb4ddc691aeb4b
  122. Result : REJECTED_NONFASTFORWARD
  123.  
  124. Local Repository Updates
  125. ==[IDE]== Mar 14, 2017 2:17:35 PM Pushing - pazaak-g17 finished.
  126. ==[IDE]== Mar 14, 2017 2:19:00 PM Pushing - pazaak-g17
  127. git branch
  128. git remote -v
  129. setting up remote: origin
  130. git submodule status
  131. git push https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 refs/heads/master:refs/heads/master
  132.  
  133. Remote Repository Updates
  134. Branch Update : master
  135. Old Id : 44e667bb12003af82e7d60e1c6bdb2593db30403
  136. New Id : b519b12c89fd1a9340cd187c66bb4ddc691aeb4b
  137. Result : REJECTED_NONFASTFORWARD
  138.  
  139. Local Repository Updates
  140. ==[IDE]== Mar 14, 2017 2:19:11 PM Pushing - pazaak-g17 finished.
  141. ==[IDE]== Mar 14, 2017 2:20:38 PM Pushing - pazaak-g17
  142. git branch
  143. git remote -v
  144. setting up remote: origin
  145. git submodule status
  146. git push https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 refs/heads/master:refs/heads/master
  147.  
  148. Remote Repository Updates
  149. Branch Update : master
  150. Old Id : 44e667bb12003af82e7d60e1c6bdb2593db30403
  151. New Id : b519b12c89fd1a9340cd187c66bb4ddc691aeb4b
  152. Result : REJECTED_NONFASTFORWARD
  153.  
  154. Local Repository Updates
  155. ==[IDE]== Mar 14, 2017 2:21:43 PM Pushing - pazaak-g17 finished.
  156. ==[IDE]== Mar 14, 2017 2:21:50 PM Pulling - pazaak-g17
  157. git remote -v
  158. setting up remote: origin
  159. git fetch https://stijnverween@github.com/HoGentTIProjecten1/pazaak-g17 +refs/heads/master:refs/remotes/origin/master
  160. Total 10 (delta 8), reused 10 (delta 8), pack-reused 0
  161. Branch : origin/master
  162. Old Id : 6a1c4332a2b2cb43b301acb1d07b6faa37780bd5
  163. New Id : 44e667bb12003af82e7d60e1c6bdb2593db30403
  164. Result : FAST_FORWARD
  165. Show changes in [Search History] or as [Diff]
  166.  
  167. ==[IDE]== Mar 14, 2017 2:21:54 PM Pulling - pazaak-g17 cancelled.
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!