search

clockworkbits / CarND-Capstone

Capstone project - Hupla Hupla team
MIT License
1 stars 0 forks source link

[#2][#14] dbw : apply steer & throttle #16

Closed anasmatic closed 6 years ago

anasmatic commented 6 years ago

I changed 2 files only that should not conflict with other branch I reset :

clockworkbits commented 6 years ago

Could you rebase it? Currently when you to the Files changed tab you can see the code which is not yours (in ros/src/waypoint_updater/waypoint_updater.py). To rebase git rebase origin/master dbw_steerthrottle and if you want to avoid solving the conflicts multiple times you probably should squash the commits into one first using git rebase -i HEAD~10 (10 because there is 10 commits of yours) and then you pick the first one and squash the rest. Here is some tutorial https://hackernoon.com/beginners-guide-to-interactive-rebasing-346a3f9c3a6d And of course you should git fetch at the very beginning of your rebase commands.

anasmatic commented 6 years ago

resolved all comments , fixed the rebase issue. only one thing, not sure if I squished all comments successfully..