search

AGV-IIT-KGP / freezing-batman

AGV
GNU General Public License v3.0
14 stars 26 forks source link

Changes done during testing on morning of 8th May,Thursday #40

Closed krishna95 closed 10 years ago

krishna95 commented 10 years ago

changes done by @dragonfly91 ...

hargup commented 10 years ago

@krishna95 There are merge conflicts resolve them. Also you are have pushed from your master branch, you should create a different branch every time you work on something new.

dragonfly91 commented 10 years ago

@krishna95 like we discussed, you need to pull the current changes to update your repo. Then, resolve the conflicts due to merge and commit the merge.

dragonfly91 commented 10 years ago

@hargup Please update this in our wiki. Commands to run the vehicle: $ roscore $ roslaunch eklavya_launchers drivers.launch $ roslaunch eklavya_launchers roboteq.launch $ roslaunch eklavya_launchers core.launch

dragonfly91 commented 10 years ago

@krishna95 please resolve the conflicts and merge ASAP!!

hargup commented 10 years ago

@dragonfly91 , Krishna did the changes the #52. I'm closing this PR.