diff --git a/docs/development/Development.md b/docs/development/Development.md index d8fe91f6f4..d18519490f 100755 --- a/docs/development/Development.md +++ b/docs/development/Development.md @@ -77,24 +77,24 @@ The main flow for a contributing is as follows: 1. Login to github, go to the INAV repository and press `fork`. 2. Then using the command line/terminal on your computer: `git clone ` 3. `cd inav` -4. `git checkout development` +4. `git checkout master` 5. `git checkout -b my-new-code` 6. Make changes 7. `git add ` 8. `git commit` 9. `git push origin my-new-code` -10. Create pull request using github UI to merge your changes from your new branch into `inav/development` +10. Create pull request using github UI to merge your changes from your new branch into `inav/master` 11. Repeat from step 4 for new other changes. -The primary thing to remember is that separate pull requests should be created for separate branches. Never create a pull request from your `development` branch. +The primary thing to remember is that separate pull requests should be created for separate branches. Never create a pull request from your `master` branch. -Later, you can get the changes from the INAV repo into your `development` branch by adding INAV as a git remote and merging from it as follows: +Later, you can get the changes from the INAV repo into your `master` branch by adding INAV as a git remote and merging from it as follows: 1. `git remote add upstream https://github.com/iNavFlight/inav.git` -2. `git checkout development` +2. `git checkout master` 3. `git fetch upstream` -4. `git merge upstream/development` -5. `git push origin development` is an optional step that will update your fork on github +4. `git merge upstream/master` +5. `git push origin master` is an optional step that will update your fork on github You can also perform the git commands using the git client inside Eclipse. Refer to the Eclipse git manual.