API tools faq
paste
ijontichy

<stdin>

ijontichy
Jun 1st, 2014
288
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.58 KB | None | 0 0
raw download clone embed print report
  1. Enter passphrase for key '/home/ijontichy/.ssh/id_rsa':
  2. From github.com:SamsaraDevs/samsaraJunk
  3. * branch master -> FETCH_HEAD
  4. warning: Cannot merge binary files: pk3/acs/samsara.o (HEAD vs. 70f20f3f8a39697955c67aae24b3c7c87aad4e8f)
  5. Removing pk3/sounds/duke/DKBSDT22.ogg
  6. Removing pk3/sounds/duke/DKBSDT16.ogg
  7. Removing pk3/sounds/duke/DKBSDT04.ogg
  8. Auto-merging pk3/extra/CREDITS
  9. CONFLICT (content): Merge conflict in pk3/extra/CREDITS
  10. Auto-merging pk3/decorate/slots/unique.dec
  11. CONFLICT (content): Merge conflict in pk3/decorate/slots/unique.dec
  12. Auto-merging pk3/decorate/slots/slot7.dec
  13. CONFLICT (content): Merge conflict in pk3/decorate/slots/slot7.dec
  14. Auto-merging pk3/decorate/pdwtak.dec
  15. Auto-merging pk3/decorate/game_doom/zombieman.dec
  16. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/zombieman.dec
  17. Auto-merging pk3/decorate/game_doom/spiders.dec
  18. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/spiders.dec
  19. Auto-merging pk3/decorate/game_doom/shotguy.dec
  20. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/shotguy.dec
  21. Auto-merging pk3/decorate/game_doom/revenant.dec
  22. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/revenant.dec
  23. Auto-merging pk3/decorate/game_doom/imp.dec
  24. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/imp.dec
  25. Auto-merging pk3/decorate/game_doom/fatso.dec
  26. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/fatso.dec
  27. Auto-merging pk3/decorate/game_doom/demons.dec
  28. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/demons.dec
  29. Auto-merging pk3/decorate/game_doom/chinguy.dec
  30. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/chinguy.dec
  31. Auto-merging pk3/decorate/game_doom/caco.dec
  32. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/caco.dec
  33. Auto-merging pk3/decorate/game_doom/bosses.dec
  34. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/bosses.dec
  35. Auto-merging pk3/decorate/game_doom/barons.dec
  36. CONFLICT (content): Merge conflict in pk3/decorate/game_doom/barons.dec
  37. Removing pk3/actors/GAME_HEXEN
  38. Removing pk3/actors/GAME_HERETIC
  39. Auto-merging pk3/acs/script_auto.h
  40. Auto-merging pk3/acs/samsaraWeps.h
  41. Auto-merging pk3/acs/samsaraMsgs.h
  42. Auto-merging pk3/acs/samsaraFuncs.h
  43. Auto-merging pk3/acs/samsaraDefs.h
  44. Auto-merging pk3/acs/samsara.o
  45. CONFLICT (content): Merge conflict in pk3/acs/samsara.o
  46. Auto-merging pk3/acs/samsara.c
  47. Removing pk3/UNUSEDCHAT
  48. Auto-merging pk3/SNDINFO.txt
  49. CONFLICT (content): Merge conflict in pk3/SNDINFO.txt
  50. Auto-merging pk3/SBARINFO.txt
  51. Auto-merging pk3/KEYCONF.txt
  52. Auto-merging pk3/DECORATE.dec
  53. Automatic merge failed; fix conflicts and then commit the result.
Advertisement
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!