paul@paul-Satellite-C55D-B ~/minetest/games/minetest_game $ git add .
paul@paul-Satellite-C55D-B ~/minetest/games/minetest_game $ git commit -m 'remove spaces between brackets'
[add_steel_bar_door_and_trapdoor 689fe46] remove spaces between brackets
 1 file changed, 1 insertion(+), 1 deletion(-)
paul@paul-Satellite-C55D-B ~/minetest/games/minetest_game $ git push origin 'add_steel_bar_door_and_trapdoor'
To git@github.com:TumeniNodes/minetest_game.git
 ! [rejected]        add_steel_bar_door_and_trapdoor -> add_steel_bar_door_and_trapdoor (fetch first)
error: failed to push some refs to 'git@github.com:TumeniNodes/minetest_game.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
paul@paul-Satellite-C55D-B ~/minetest/games/minetest_game $ git pull origin 'add_steel_bar_door_and_trapdoor'
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (5/5), done.
From github.com:TumeniNodes/minetest_game
 * branch            add_steel_bar_door_and_trapdoor -> FETCH_HEAD
   307f69e..cbd0d2b  add_steel_bar_door_and_trapdoor -> origin/add_steel_bar_door_and_trapdoor
Auto-merging mods/doors/init.lua
CONFLICT (content): Merge conflict in mods/doors/init.lua
Automatic merge failed; fix conflicts and then commit the result.