SHARE
TWEET

merge conflict

TumeniNodes Jul 13th, 2018 69 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. $ git pull https://github.com/kaadmy/minetest 'shading'
  2. remote: Counting objects: 355, done.
  3. remote: Total 355 (delta 206), reused 206 (delta 206), pack-reused 149
  4. Receiving objects: 100% (355/355), 133.33 KiB | 0 bytes/s, done.
  5. Resolving deltas: 100% (287/287), completed with 73 local objects.
  6. From https://github.com/kaadmy/minetest
  7.  * branch            shading    -> FETCH_HEAD
  8. Auto-merging src/wieldmesh.cpp
  9. Auto-merging src/script/common/c_content.cpp
  10. Auto-merging src/nodedef.cpp
  11. Auto-merging src/mesh.h
  12. Auto-merging src/mesh.cpp
  13. Auto-merging src/mapblock_mesh.cpp
  14. CONFLICT (content): Merge conflict in src/mapblock_mesh.cpp
  15. Auto-merging src/game.cpp
  16. CONFLICT (content): Merge conflict in src/game.cpp
  17. Auto-merging src/defaultsettings.cpp
  18. Auto-merging src/content_mapblock.cpp
  19. CONFLICT (content): Merge conflict in src/content_mapblock.cpp
  20. Auto-merging src/content_cao.h
  21. Auto-merging src/content_cao.cpp
  22. CONFLICT (content): Merge conflict in src/content_cao.cpp
  23. Auto-merging src/clientenvironment.cpp
  24. Auto-merging src/camera.h
  25. Auto-merging src/camera.cpp
  26. CONFLICT (content): Merge conflict in src/camera.cpp
  27. Auto-merging minetest.conf.example
  28. Auto-merging builtin/settingtypes.txt
  29. Auto-merging builtin/mainmenu/tab_settings.lua
  30. CONFLICT (content): Merge conflict in builtin/mainmenu/tab_settings.lua
  31. Automatic merge failed; fix conflicts and then commit the result.
RAW Paste Data
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
 
Top