git-blackbox-log

PS C:\Github\BlackBox> git pull denis alpha_test
remote: Enumerating objects: 423, done.
remote: Counting objects: 100% (423/423), done.
remote: Compressing objects: 100% (218/218), done.
remote: Total 423 (delta 237), reused 350 (delta 179), pack-reused 0
Receiving objects: 100% (423/423), 29.59 MiB | 333.00 KiB/s, done.
Resolving deltas: 100% (237/237), completed with 12 local objects.
From https://github.com/fromasmtodisasm/BlackBox
 * branch            alpha_test -> FETCH_HEAD
 * [new branch]      alpha_test -> denis/alpha_test
Removing src/VertexBuffer.cpp
Removing src/Texture.cpp
Removing src/NewCamera.cpp
Removing src/MatrixTransform.cpp
Removing src/Light.cpp
Auto-merging src/Engine/World.cpp
Auto-merging src/Engine/Window/CSFMLWindow.cpp
Auto-merging src/Engine/Scene.cpp
CONFLICT (content): Merge conflict in src/Engine/Scene.cpp
Auto-merging src/Engine/Render/Material.cpp
Auto-merging src/Engine/Game/GameGUI.cpp
Auto-merging src/Engine/Game/CGame.cpp
CONFLICT (content): Merge conflict in src/Engine/Game/CGame.cpp
Auto-merging src/CMakeLists.txt
CONFLICT (content): Merge conflict in src/CMakeLists.txt
Auto-merging res/shaders/texturedphong.frag
CONFLICT (content): Merge conflict in res/shaders/texturedphong.frag
Auto-merging res/scenes/default.xml
CONFLICT (content): Merge conflict in res/scenes/default.xml
Auto-merging res/materials/default.xml
CONFLICT (content): Merge conflict in res/materials/default.xml
Removing res/images/cross.png
Removing include/BlackBox/VertexBuffer.hpp
Removing include/BlackBox/Texture.hpp
Auto-merging .gitmodules
CONFLICT (content): Merge conflict in .gitmodules
Automatic merge failed; fix conflicts and then commit the result.
PS C:\Github\BlackBox> git branch
  develop
  experiment
  master
* normal_mapping
PS C:\Github\BlackBox> git log
commit 41810dc891dd08ef07032c2f45f1f05c50e30ab4 (HEAD -> normal_mapping, denis/normal_mapping)
Author: hackman <chiappa24@gmail.com>
Date:   Sun May 26 20:23:46 2019 +0300

    Added assimp submodule