i think it is the same.....

[cretaceous-creature]

plz check how to fix

[tongtybj]

@cretaceous-creature

$ git checkout -b cretaceous-creature-master indigo-devel $ git pull git://github.com/cretaceous-creature/mbzirc.git master

then get following message: remote: Counting objects: 40, done. remote: Compressing objects: 100% (27/27), done. remote: Total 40 (delta 10), reused 38 (delta 8), pack-reused 0 Unpacking objects: 100% (40/40), done. From git://github.com/cretaceous-creature/mbzirc

• branch master -> FETCH_HEAD CONFLICT (rename/add): Rename gazebomodel/models/arena/model.sdf->gazebo_model/models/arena/model.sdf in HEAD. gazebo_model/models/arena/model.sdf added in a13a48838659ebe2fed3809039c0a2e8d4e61f79 Adding as gazebo_model/models/arena/model.sdf~a13a48838659ebe2fed3809039c0a2e8d4e61f79 instead CONFLICT (rename/add): Rename gazebomodel/models/eight/model.config->gazebo_model/models/eight/model.config in HEAD. gazebo_model/models/eight/model.config added in a13a48838659ebe2fed3809039c0a2e8d4e61f79 Adding as gazebo_model/models/eight/model.config~a13a48838659ebe2fed3809039c0a2e8d4e61f79 instead CONFLICT (rename/add): Rename gazebomodel/models/pad/arena/model.config->gazebo_model/models/arena/model.config in HEAD. gazebo_model/models/arena/model.config added in a13a48838659ebe2fed3809039c0a2e8d4e61f79 Adding as gazebo_model/models/arena/model.config~a13a48838659ebe2fed3809039c0a2e8d4e61f79 instead CONFLICT (rename/add): Rename gazebomodel/models/pad/model.config->gazebo_model/models/pad/model.config in HEAD. gazebo_model/models/pad/model.config added in a13a48838659ebe2fed3809039c0a2e8d4e61f79 Adding as gazebo_model/models/pad/model.config~a13a48838659ebe2fed3809039c0a2e8d4e61f79 instead CONFLICT (rename/add): Rename gazebomodel/models/pad/panel/model.config->gazebo_model/models/panel/model.config in HEAD. gazebo_model/models/panel/model.config added in a13a48838659ebe2fed3809039c0a2e8d4e61f79 Adding as gazebo_model/models/panel/model.config~a13a48838659ebe2fed3809039c0a2e8d4e61f79 instead CONFLICT (rename/add): Rename gazebomodel/models/pad/stem/model.config->gazebo_model/models/stem/model.config in HEAD. gazebo_model/models/stem/model.config added in a13a48838659ebe2fed3809039c0a2e8d4e61f79 Adding as gazebo_model/models/stem/model.config~a13a48838659ebe2fed3809039c0a2e8d4e61f79 instead Auto-merging setup.sh CONFLICT (add/add): Merge conflict in setup.sh Auto-merging gazebo_model/world/mbzirc_arena.world CONFLICT (add/add): Merge conflict in gazebo_model/world/mbzirc_arena.world Auto-merging gazebo_model/models/panel/model.sdf CONFLICT (add/add): Merge conflict in gazebo_model/models/panel/model.sdf Auto-merging gazebo_model/models/pad/model.sdf CONFLICT (add/add): Merge conflict in gazebo_model/models/pad/model.sdf Auto-merging gazebo_model/models/eight/model.sdf CONFLICT (add/add): Merge conflict in gazebo_model/models/eight/model.sdf Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.