Home

Welcome to the Introduction to Robotics wiki home page! Information about labs and using the ADrone can be found via the menu bar.

#Git Help Sometimes example code is given for labs, and the repo is updated accordingly. Before you try to get the latest changes, you should first commit your work on the previous lab, so you don't lose anything. After commiting, execute git pull -X ours

this will pull the latest changes from the repo, and the -X ours option causes git to automatically resolve any merge conflicts in your favor (which is probably for the best).