Paste Code
Paste Blends
Paste Images
D:\blendersvn>cd dyntopo-slim

D:\blendersvn\dyntopo-slim>git pull origin +dyntopo-slim
remote: Counting objects: 2132, done.
remote: Compressing objects: 100% (398/398), done.

Receiving objects: 100% (1511/1511), 498.08 KiB | 54 KiB/s, done.
Resolving deltas: 100% (1343/1343), completed with 606 local objects.
From https://github.com/nicholasbishop/blender
* branch dyntopo-slim -> FETCH_HEAD
Auto-merging source/blender/editors/sculpt_paint/sculpt_intern.h
Auto-merging source/blender/editors/sculpt_paint/sculpt.c
CONFLICT (content): Merge conflict in source/blender/editors/sculpt_paint/sculpt.c
Auto-merging source/blender/editors/sculpt_paint/paint_intern.h
Auto-merging source/blender/editors/sculpt_paint/paint_image.c
Auto-merging source/blender/editors/mesh/mesh_intern.h
Auto-merging source/blender/editors/mesh/editmesh_tools.c
CONFLICT (content): Merge conflict in source/blender/editors/mesh/editmesh_tools.c
Auto-merging source/blender/bmesh/operators/bmo_symmetrize.c
CONFLICT (add/add): Merge conflict in source/blender/bmesh/operators/bmo_symmetrize.c
Auto-merging source/blender/bmesh/intern/bmesh_queries.h
Auto-merging source/blender/bmesh/intern/bmesh_queries.c
Auto-merging source/blender/bmesh/intern/bmesh_opdefines.c
CONFLICT (content): Merge conflict in source/blender/bmesh/intern/bmesh_opdefines.c
Auto-merging source/blender/bmesh/intern/bmesh_log.h
CONFLICT (add/add): Merge conflict in source/blender/bmesh/intern/bmesh_log.h
Auto-merging source/blender/bmesh/intern/bmesh_log.c
CONFLICT (add/add): Merge conflict in source/blender/bmesh/intern/bmesh_log.c
Auto-merging source/blender/blenlib/intern/pbvh_intern.h
CONFLICT (add/add): Merge conflict in source/blender/blenlib/intern/pbvh_intern.h
Auto-merging source/blender/blenlib/CMakeLists.txt
Auto-merging source/blender/blenkernel/intern/object.c
Auto-merging release/scripts/startup/bl_ui/space_view3d_toolbar.py
Automatic merge failed; fix conflicts and then commit the result.

D:\blendersvn\dyntopo-slim>
  1. D:\blendersvn>cd dyntopo-slim
  2.  
  3. D:\blendersvn\dyntopo-slim>git pull origin +dyntopo-slim
  4. remote: Counting objects: 2132, done.
  5. remote: Compressing objects: 100% (398/398), done.
  6.  
  7. Receiving objects: 100% (1511/1511), 498.08 KiB | 54 KiB/s, done.
  8. Resolving deltas: 100% (1343/1343), completed with 606 local objects.
  9. From https://github.com/nicholasbishop/blender
  10.  * branch            dyntopo-slim -> FETCH_HEAD
  11. Auto-merging source/blender/editors/sculpt_paint/sculpt_intern.h
  12. Auto-merging source/blender/editors/sculpt_paint/sculpt.c
  13. CONFLICT (content): Merge conflict in source/blender/editors/sculpt_paint/sculpt.c
  14. Auto-merging source/blender/editors/sculpt_paint/paint_intern.h
  15. Auto-merging source/blender/editors/sculpt_paint/paint_image.c
  16. Auto-merging source/blender/editors/mesh/mesh_intern.h
  17. Auto-merging source/blender/editors/mesh/editmesh_tools.c
  18. CONFLICT (content): Merge conflict in source/blender/editors/mesh/editmesh_tools.c
  19. Auto-merging source/blender/bmesh/operators/bmo_symmetrize.c
  20. CONFLICT (add/add): Merge conflict in source/blender/bmesh/operators/bmo_symmetrize.c
  21. Auto-merging source/blender/bmesh/intern/bmesh_queries.h
  22. Auto-merging source/blender/bmesh/intern/bmesh_queries.c
  23. Auto-merging source/blender/bmesh/intern/bmesh_opdefines.c
  24. CONFLICT (content): Merge conflict in source/blender/bmesh/intern/bmesh_opdefines.c
  25. Auto-merging source/blender/bmesh/intern/bmesh_log.h
  26. CONFLICT (add/add): Merge conflict in source/blender/bmesh/intern/bmesh_log.h
  27. Auto-merging source/blender/bmesh/intern/bmesh_log.c
  28. CONFLICT (add/add): Merge conflict in source/blender/bmesh/intern/bmesh_log.c
  29. Auto-merging source/blender/blenlib/intern/pbvh_intern.h
  30. CONFLICT (add/add): Merge conflict in source/blender/blenlib/intern/pbvh_intern.h
  31. Auto-merging source/blender/blenlib/CMakeLists.txt
  32. Auto-merging source/blender/blenkernel/intern/object.c
  33. Auto-merging release/scripts/startup/bl_ui/space_view3d_toolbar.py
  34. Automatic merge failed; fix conflicts and then commit the result.
  35.  
  36. D:\blendersvn\dyntopo-slim>
go to heaven