Hello, I was going thruough the guide for rebasing the code and have a couple of points that might be worth adding in to make it easier for other users. I’ve added in a couple of extra steps plus a few steps that make sure the updated code is synced with the users account.
Changed are marked in red.
[color=#FF0000]Navigate git to your ardupilot repository.
Ensure you are looking at your master branch
git checkout master[/color]
Ensure your repository is connected to the upstream repository you forked from.
git remote add upstream https://github.com/diydrones/ardupilot.git
Fetch changes from the upstream master.
git fetch upstream
Rebase your current branch from the upstream master.
git rebase upstream/master
[color=#FF0000]Ensure your repository is connected to the your repository on github.
git remote add origin https://github.com//ardupilot.git[/color]
[color=#FF0000]Now push the updated master to your github repository
git push origin master[/color]
[color=#FF0000]Enter you github user-name and password as prompted[/color]